Adjust ocloc/LIT tests for opaque and typed pointers

Adjust ocloc/LIT tests for opaque and typed pointers

Author: matborzyszkowski

IGC/ocloc_tests/SPIRV-extenstions/SPV_INTEL_blocking_pipes/PipeBlocking.ll

@@ -2,12 +2,11 @@
 ; REQUIRES: llvm-spirv, regkeys, dg2-supported, llvm-15-or-older
 
 ; TODO: This test fails on LLVM 16 with opaque pointers, but passes with typed pointers. Once the necessary fixes are made, remove llvm-15-or-older from the list above. llvm-15-or-older was added to the list above to prevent non-zero return from llvm-lit on LLVM 16 build with typed pointers forced.
-; XFAIL: llvm-16-plus
 
 ; LLVM with typed pointers/default pointer typing:
 ; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_blocking_pipes,+SPV_INTEL_arbitrary_precision_integers -o %t.spv
-; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
+; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'EnableOpaquePointersBackend=0, ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
 
 ; ModuleID = 'test/CodeGenOpenCL/pipe_builtin.cl'
 source_filename = "test/CodeGenOpenCL/pipe_builtin.cl"

IGC/ocloc_tests/SPIRV-extenstions/SPV_INTEL_joint_matrix/joint_matrix_bfloat16.ll

@@ -1,10 +1,12 @@
 ; UNSUPPORTED: system-windows
-; REQUIRES: llvm-spirv, regkeys, dg2-supported
-; XFAIL: llvm-16-plus
+; REQUIRES: llvm-spirv, regkeys, dg2-supported, llvm-15-or-older
 
-; RUN: llvm-as %s -o %t.bc
-; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_bfloat16_conversion,+SPV_INTEL_joint_matrix -o %t.spv
-; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
+; TODO: This test should be adjusted to run with opaque pointers
+
+; LLVM with typed pointers:
+; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
+; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_bfloat16_conversion,+SPV_INTEL_joint_matrix -o %t.spv
+; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'EnableOpaquePointersBackend=0, ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
 
 ; CHECK-LLVM: %spirv.JointMatrixINTEL._short_8_16_0_3
 ; CHECK-LLVM: %[[GEP1:.*]] = getelementptr inbounds %"class.cl::sycl::ext::intel::experimental::bfloat16", %"class.cl::sycl::ext::intel::experimental::bfloat16" addrspace(4)* %{{.*}}, i64 0, i32 0

IGC/ocloc_tests/SPIRV-extenstions/SPV_INTEL_masked_gather_scatter/intel-gather-scatter.ll

@@ -1,15 +1,14 @@
 ; UNSUPPORTED: system-windows
-; REQUIRES: llvm-spirv, regkeys, dg2-supported, llvm-14-plus
-; XFAIL: llvm-16-plus
+; REQUIRES: llvm-spirv, regkeys, dg2-supported
 
 ; LLVM with opaque pointers:
-; TODO: llvm-as -opaque-pointers=1 %s -o %t.bc
-; TODO: llvm-spirv %t.bc -opaque-pointers=1 --spirv-ext=+SPV_INTEL_masked_gather_scatter -o %t.spv
-; TODO: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'EnableOpaquePointersBackend=1,ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
+; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-spirv %t.bc -opaque-pointers=1 --spirv-ext=+SPV_INTEL_masked_gather_scatter -o %t.spv
+; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'EnableOpaquePointersBackend=1, ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
 
 ; LLVM with typed pointers/default pointer typing:
-; RUN: llvm-as %s -o %t.bc
-; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_masked_gather_scatter -o %t.spv
+; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
+; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_masked_gather_scatter -o %t.spv
 ; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
 
 ; CHECK-LLVM: %[[#VECGATHER:]] = load <4 x {{i32|ptr}} addrspace(4){{.*}}>, {{<4 x i32 addrspace\(4\)\*>\*|ptr}}

IGC/ocloc_tests/SPIRV-extenstions/SPV_INTEL_usm_storage_classes/intel_usm_addrspaces.ll

@@ -2,12 +2,11 @@
 ; REQUIRES: llvm-spirv, regkeys, dg2-supported, llvm-14-plus
 
 ; LLVM with opaque pointers:
-; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
-; TODO: Currently llvm-spirv fails with this test when run with -opaque-pointers=1. Change once fixed.
-; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_usm_storage_classes -o %t.spv
+; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-spirv %t.bc -opaque-pointers=1 --spirv-ext=+SPV_INTEL_usm_storage_classes -o %t.spv
 ; RUN: ocloc compile -spirv_input -file %t.spv -device dg2 -options " -igc_opts 'EnableOpaquePointersBackend=1,ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM
 
-; RUN: llvm-spirv %t.bc -opaque-pointers=0 -o %t.no_usm.spv
+; RUN: llvm-spirv %t.bc -opaque-pointers=1 -o %t.no_usm.spv
 ; RUN: ocloc compile -spirv_input -file %t.no_usm.spv -device dg2 -options " -igc_opts 'EnableOpaquePointersBackend=1,ShaderDumpTranslationOnly=1'" 2>&1 | FileCheck %s --check-prefixes=CHECK-LLVM-NO-USM
 
 ; LLVM with typed pointers/default pointer typing:

IGC/ocloc_tests/features/cache_controls/cl_intel_subgroups_buffer_prefetch/SPV_INTEL_subgroup_buffer_prefetch.ll

@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 
-; REQUIRES: llvm-spirv, regkeys, pvc-supported, llvm-15-or-older
+; REQUIRES: llvm-spirv, regkeys, pvc-supported
 ; UNSUPPORTED: sys32
 
 ; LLVM with opaque pointers:
@@ -21,6 +21,7 @@
 ; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_subgroups,+SPV_INTEL_cache_controls -o %t.spv
 ; RUN: ocloc compile -spirv_input -file %t.spv -device pvc -options " -igc_opts 'DumpVISAASMToConsole=1'" 2>&1 | FileCheck %s
 
+
 target triple = "spir64-unknown-unknown"
 
 declare spir_func void @_Z34__spirv_SubgroupBlockPrefetchINTELPU3AS1Khj(i8 addrspace(1)*, i32)