From ba1e085587a3f72e5f3453f436034d7ac7183045 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 28 Aug 2019 00:36:45 +0100 Subject: [PATCH] clover: replace more complex 3.x version check with LLVM_VERSION_MAJOR/MINOR MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Acked-by: Michel Dänzer --- src/gallium/state_trackers/clover/llvm/metadata.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/clover/llvm/metadata.hpp b/src/gallium/state_trackers/clover/llvm/metadata.hpp index 825008d4974..4a6f37d8f5d 100644 --- a/src/gallium/state_trackers/clover/llvm/metadata.hpp +++ b/src/gallium/state_trackers/clover/llvm/metadata.hpp @@ -32,6 +32,7 @@ #include "util/algorithm.hpp" #include +#include #include #include @@ -57,7 +58,7 @@ namespace clover { inline bool is_kernel(const ::llvm::Function &f) { -#if HAVE_LLVM >= 0x0309 +#if (LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 9)) return f.getMetadata("kernel_arg_type"); #else return clover::any_of(is_kernel_node_for(f), @@ -68,7 +69,7 @@ namespace clover { inline iterator_range< ::llvm::MDNode::op_iterator> get_kernel_metadata_operands(const ::llvm::Function &f, const std::string &name) { -#if HAVE_LLVM >= 0x0309 +#if (LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 9)) // On LLVM v3.9+ kernel argument attributes are stored as // function metadata. const auto data_node = f.getMetadata(name); -- 2.30.2