clover/llvm: Use the highest supported SPIR-V version (v4)

[mesa.git] / src / gallium / frontends / clover / llvm / invocation.cpp

diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
index 95a9d036622a29117087221badb822da8a0059a9..04db2f90e03da111fe0d37f98df950c29d771964 100644 (file)
--- a/src/gallium/frontends/clover/llvm/invocation.cpp
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
@@ -307,6 +307,18 @@ namespace {
 
       return act.takeModule();
    }
+
+#ifdef HAVE_CLOVER_SPIRV
+   SPIRV::TranslatorOpts
+   get_spirv_translator_options(const device &dev) {
+      const auto supported_versions = spirv::supported_versions();
+      const auto maximum_spirv_version =
+         std::min(static_cast<SPIRV::VersionNumber>(supported_versions.back()),
+                  SPIRV::VersionNumber::MaximumVersion);
+
+      return SPIRV::TranslatorOpts(maximum_spirv_version);
+   }
+#endif
 }
 
 module
@@ -438,6 +450,8 @@ clover::llvm::compile_to_spirv(const std::string &source,
    if (has_flag(debug::llvm))
       debug::log(".ll", print_module_bitcode(*mod));
 
+   const auto spirv_options = get_spirv_translator_options(dev);
+
    std::string error_msg;
    if (!::llvm::regularizeLlvmForSpirv(mod.get(), error_msg)) {
       r_log += "Failed to regularize LLVM IR for SPIR-V: " + error_msg + ".\n";
@@ -445,7 +459,7 @@ clover::llvm::compile_to_spirv(const std::string &source,
    }
 
    std::ostringstream os;
-   if (!::llvm::writeSpirv(mod.get(), os, error_msg)) {
+   if (!::llvm::writeSpirv(mod.get(), spirv_options, os, error_msg)) {
       r_log += "Translation from LLVM IR to SPIR-V failed: " + error_msg + ".\n";
       throw error(CL_INVALID_VALUE);
    }