summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Herbst <kherbst@redhat.com>2019-05-10 09:27:06 +0200
committerKarol Herbst <karolherbst@gmail.com>2019-09-21 08:28:32 +0000
commit1befaf4417d81d7fccf8b8d2d59e7b57d0255dd3 (patch)
tree0b87cde08d623bfc96765894907b1f2b78c0d0c6
parentc8cd8e279de97913c2b9ce1bd17f96de0c263ae8 (diff)
downloadmesa-1befaf4417d81d7fccf8b8d2d59e7b57d0255dd3.tar.gz
clover: prepare supporting multiple IRs
v2: rework arguments to compiler::compile_program add assert to device::ir_format v3: remove PIPE_SHADER_IR_SPIRV change title Signed-off-by: Karol Herbst <kherbst@redhat.com> Reviewed-by: Francisco Jerez <currojerez@riseup.net> (v2) Reviewed-by: Pierre Moreau <pierre.morrow@free.fr>
-rw-r--r--src/gallium/state_trackers/clover/core/compiler.hpp59
-rw-r--r--src/gallium/state_trackers/clover/core/program.cpp10
-rw-r--r--src/gallium/state_trackers/clover/meson.build1
3 files changed, 64 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/clover/core/compiler.hpp b/src/gallium/state_trackers/clover/core/compiler.hpp
new file mode 100644
index 00000000000..4ed20061627
--- /dev/null
+++ b/src/gallium/state_trackers/clover/core/compiler.hpp
@@ -0,0 +1,59 @@
+//
+// Copyright 2019 Red Hat, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#ifndef CLOVER_CORE_COMPILER_HPP
+#define CLOVER_CORE_COMPILER_HPP
+
+#include "core/device.hpp"
+#include "core/module.hpp"
+#include "llvm/invocation.hpp"
+
+namespace clover {
+ namespace compiler {
+ static inline module
+ compile_program(const std::string &source, const header_map &headers,
+ const device &dev, const std::string &opts,
+ std::string &log) {
+ switch (dev.ir_format()) {
+ case PIPE_SHADER_IR_NATIVE:
+ return llvm::compile_program(source, headers, dev, opts, log);
+ default:
+ unreachable("device with unsupported IR");
+ throw error(CL_INVALID_VALUE);
+ }
+ }
+
+ static inline module
+ link_program(const std::vector<module> &ms, const device &dev,
+ const std::string &opts, std::string &log) {
+ switch (dev.ir_format()) {
+ case PIPE_SHADER_IR_NATIVE:
+ return llvm::link_program(ms, dev, opts, log);
+ default:
+ unreachable("device with unsupported IR");
+ throw error(CL_INVALID_VALUE);
+ }
+ }
+ }
+}
+
+#endif
diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/state_trackers/clover/core/program.cpp
index 62fa13efbf9..526e06a26c3 100644
--- a/src/gallium/state_trackers/clover/core/program.cpp
+++ b/src/gallium/state_trackers/clover/core/program.cpp
@@ -20,8 +20,8 @@
// OTHER DEALINGS IN THE SOFTWARE.
//
+#include "core/compiler.hpp"
#include "core/program.hpp"
-#include "llvm/invocation.hpp"
using namespace clover;
@@ -51,9 +51,8 @@ program::compile(const ref_vector<device> &devs, const std::string &opts,
std::string log;
try {
- assert(dev.ir_format() == PIPE_SHADER_IR_NATIVE);
- const module m = llvm::compile_program(_source, headers, dev, opts,
- log);
+ const module m =
+ compiler::compile_program(_source, headers, dev, opts, log);
_builds[&dev] = { m, opts, log };
} catch (...) {
_builds[&dev] = { module(), opts, log };
@@ -75,8 +74,7 @@ program::link(const ref_vector<device> &devs, const std::string &opts,
std::string log = _builds[&dev].log;
try {
- assert(dev.ir_format() == PIPE_SHADER_IR_NATIVE);
- const module m = llvm::link_program(ms, dev, opts, log);
+ const module m = compiler::link_program(ms, dev, opts, log);
_builds[&dev] = { m, opts, log };
} catch (...) {
_builds[&dev] = { module(), opts, log };
diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build
index 2f5b287d976..13d554c3fbf 100644
--- a/src/gallium/state_trackers/clover/meson.build
+++ b/src/gallium/state_trackers/clover/meson.build
@@ -81,6 +81,7 @@ clover_files = files(
'api/sampler.cpp',
'api/transfer.cpp',
'api/util.hpp',
+ 'core/compiler.hpp',
'core/context.cpp',
'core/context.hpp',
'core/device.cpp',