Remove LLVM_14_0+ from lit tests

dbabokin · Nov 8, 2024 · 80dccf9 · 80dccf9
1 parent 7573605
commit 80dccf9
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 16 deletions.
diff --git a/tests/lit-tests/1323_1.ispc b/tests/lit-tests/1323_1.ispc
@@ -1,7 +1,7 @@
 // RUN: %{ispc} %s --target=sse2-i32x4,sse4-i32x8,avx1-i32x8,avx2-i32x8,avx512skx-x16 -h %t.h --emit-llvm -o %t.bc
 // -opaque-pointers option was introduced in LLVM 14.0 and it's became necessary to pass it explicitely to llvm-dis starting LLVM 16.0
 // RUN: llvm-dis -opaque-pointers=0 %t.bc -o - | FileCheck %s -check-prefix=CHECK_TYPES
-// REQUIRES: X86_ENABLED && LLVM_14_0+
+// REQUIRES: X86_ENABLED
 
 // The test doesn't make sense in opaque mode, all types will be opaque.
 // UNSUPPORTED: OPAQUE_PTRS_ENABLED

diff --git a/tests/lit-tests/avx512spr-i32x8.ispc b/tests/lit-tests/avx512spr-i32x8.ispc
@@ -14,7 +14,7 @@
 //; RUN: %{ispc} %s --target=avx512spr-x8 --emit-llvm -o %t_8.bc
 //; RUN: llvm-dis %t_8.bc -o - | FileCheck %s -check-prefix=CHECK_ATTR_8
 
-// REQUIRES: X86_ENABLED && LLVM_14_0+ && !MACOS_HOST
+// REQUIRES: X86_ENABLED && !MACOS_HOST
 
 double ret_round(double val)
 {

diff --git a/tests/lit-tests/cpus_x86_llvm14.ispc b/tests/lit-tests/cpus_x86_llvm14.ispc
@@ -3,7 +3,7 @@
 //; RUN: %{ispc} %s -o %t.o --nostdlib --target=sse2-i32x4 --cpu=sapphirerapids
 //; RUN: %{ispc} %s -o %t.o --nostdlib --target=sse2-i32x4 --cpu=spr
 
-// REQUIRES: X86_ENABLED && LLVM_14_0+
+// REQUIRES: X86_ENABLED
 
 uniform int i;
 

diff --git a/tests/lit-tests/disable_gather_scatter.ispc b/tests/lit-tests/disable_gather_scatter.ispc
@@ -56,7 +56,7 @@
 // RUN: %{ispc} %s -O2 --woff --target=avx512spr-x64 --addressing=32 --nostdlib --emit-llvm-text --opt=disable-gathers --opt=disable-scatters -o - | FileCheck %s
 // RUN: %{ispc} %s -O2 --woff --target=avx512spr-x64 --addressing=64 --nostdlib --emit-llvm-text --opt=disable-gathers --opt=disable-scatters -o - | FileCheck %s
 
-// REQUIRES: X86_ENABLED && LLVM_14_0+ && !MACOS_HOST
+// REQUIRES: X86_ENABLED && !MACOS_HOST
 
 // CHECK-LABEL: gather_scatter_base_offset_int32___
 // CHECK-NOT: @llvm.{{.*}}.gather{{.*}}

diff --git a/tests/lit-tests/fp16_code_gen.ispc b/tests/lit-tests/fp16_code_gen.ispc
@@ -8,7 +8,7 @@
 // RUN: %{ispc} %s --target=avx512spr-x32 --emit-asm -o - | FileCheck %s -check-prefix=CHECK_SPR
 // RUN: %{ispc} %s --target=avx512spr-x64 --emit-asm -o - | FileCheck %s -check-prefix=CHECK_SPR
 
-// REQUIRES: X86_ENABLED && LLVM_14_0+ && !MACOS_HOST
+// REQUIRES: X86_ENABLED && !MACOS_HOST
 
 // CHECK_SPR-LABEL: fp16_add
 // CHECK_SPR: vaddph

diff --git a/tests/lit-tests/interleaved.ispc b/tests/lit-tests/interleaved.ispc
@@ -2,7 +2,7 @@
 // RUN: %{ispc} %s --target=avx1 -O2 --opt=fast-math  -h %t.h --emit-asm -o - | FileCheck %s -check-prefix=CHECK_AVX
 // RUN: %{ispc} %s --target=sse4 -O2 --opt=fast-math  -h %t.h --emit-asm -o - | FileCheck %s -check-prefix=CHECK_SSE
 // RUN: %{ispc} %s --target=sse2 -O2 --opt=fast-math  -h %t.h --emit-asm -o - | FileCheck %s -check-prefix=CHECK_SSE
-// REQUIRES: X86_ENABLED && LLVM_14_0+
+// REQUIRES: X86_ENABLED
 export void test_interleaved(const uniform float xin[],
                              const uniform float yin[],
                              const uniform float zin[],

diff --git a/tests/lit-tests/lit.cfg b/tests/lit-tests/lit.cfg
@@ -33,12 +33,6 @@ print("Config:")
 # LLVM version
 llvm_version_major = int(ispc_llvm_version_number.split('.')[0])
 
-if llvm_version_major >= 14:
-    print("LLVM_14_0+: YES")
-    config.available_features.add("LLVM_14_0+")
-else:
-    print("LLVM_14_0+: NO")
-
 if llvm_version_major >= 16:
     print("LLVM_16_0+: YES")
     config.available_features.add("LLVM_16_0+")

diff --git a/tests/lit-tests/load_store_vectorizer_loopunroll.ispc b/tests/lit-tests/load_store_vectorizer_loopunroll.ispc
@@ -13,7 +13,7 @@
 // RUN: %{ispc} %s --target=gen9-x8 --arch=xe64 -h %t.h --emit-llvm-text --debug-phase=325:325 --dump-file=%t -o /dev/null
 // RUN: FileCheck --input-file %t/ir_325_LoadStoreVectorizerPass.ll %s --check-prefixes CHECK_ALL,CHECK
 
-// REQUIRES: XE_ENABLED && LLVM_14_0+
+// REQUIRES: XE_ENABLED
 
 #define LOAD(n)   \
     a[n] = _in[n]

diff --git a/tests/lit-tests/perf-warnings.ispc b/tests/lit-tests/perf-warnings.ispc
@@ -36,7 +36,7 @@
 // A note about notrunning on macOS - it's because of SPR not being supported there.
 // It should be sufficient to run this test on other platforms and not to complicate
 // with splitting it to SPR and non-SPR versions.
-// REQUIRES: X86_ENABLED && LLVM_14_0+ && !MACOS_HOST
+// REQUIRES: X86_ENABLED && !MACOS_HOST
 
 // Float16 -> integers
 

diff --git a/tests/lit-tests/target_x86_macos_no_spr.ispc b/tests/lit-tests/target_x86_macos_no_spr.ispc
@@ -6,7 +6,7 @@
 //; RUN: not %{ispc} %s -o %t.o --nostdlib --target-os=macos --arch=x86-64 --nowrap --target=avx512spr-x32 2>&1 | FileCheck %s
 //; RUN: not %{ispc} %s -o %t.o --nostdlib --target-os=macos --arch=x86-64 --nowrap --target=avx512spr-x64 2>&1 | FileCheck %s
 
-// REQUIRES: X86_ENABLED && LLVM_14_0+ && MACOS_HOST
+// REQUIRES: X86_ENABLED && MACOS_HOST
 
 // CHECK: Error: avx512spr-x{{.*}} target for x86-64 on macOS is not supported in current build.
 

diff --git a/tests/lit-tests/targets_x86_llvm14plus.ispc b/tests/lit-tests/targets_x86_llvm14plus.ispc
@@ -6,7 +6,7 @@
 //; RUN: %{ispc} %s -o %t.o --nostdlib --target=avx512spr-x32
 //; RUN: %{ispc} %s -o %t.o --nostdlib --target=avx512spr-x64
 
-// REQUIRES: X86_ENABLED && LLVM_14_0+ && !MACOS_HOST
+// REQUIRES: X86_ENABLED && !MACOS_HOST
 
 uniform int j;