Skip to content

Commit 51d3372

Browse files
svenvhPavel V Chupin
svenvh
authored and
Pavel V Chupin
committed
Temporarily run clang with -no-opaque-pointers
Upstream Clang is generating opaque pointers by default since 702d5de ("[Clang] Enable opaque pointers by default", 2022-04-11). However, the translator isn't ready for that yet, so disable opaque pointers temporarily. Original commit: KhronosGroup/SPIRV-LLVM-Translator@e1d70a3
1 parent 49cd5f2 commit 51d3372

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+41
-41
lines changed

‎llvm-spirv/test/CXX/global-ctor.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -cl-std=clc++ -emit-llvm-bc -triple spir -O0 %s -o %t.bc
1+
// RUN: %clang_cc1 -cl-std=clc++ -emit-llvm-bc -triple spir -O0 %s -o %t.bc -no-opaque-pointers
22
// RUN: llvm-spirv %t.bc -o %t.spv
33
// RUN: spirv-val %t.spv
44
// RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV

‎llvm-spirv/test/ComparePointers.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kernel void test(int global *in, int global *in2) {
88
if (in < in2)
99
return;
1010
}
11-
// RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -O0 -emit-llvm-bc %s -o %t.bc
11+
// RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -O0 -emit-llvm-bc %s -o %t.bc -no-opaque-pointers
1212
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spt
1313
// RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
1414
// RUN: llvm-spirv %t.bc -o %t.spv

‎llvm-spirv/test/DebugInfo/BuiltinCallLocation.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Check that DebugLoc attached to a builtin call is preserved after translation.
22

3-
// RUN: %clang_cc1 -triple spir -fdeclare-opencl-builtins -finclude-default-header %s -disable-llvm-passes -emit-llvm-bc -debug-info-kind=line-tables-only -o %t.bc
3+
// RUN: %clang_cc1 -triple spir -fdeclare-opencl-builtins -finclude-default-header %s -disable-llvm-passes -emit-llvm-bc -debug-info-kind=line-tables-only -o %t.bc -no-opaque-pointers
44
// RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
55
// RUN: llvm-spirv %t.bc -o %t.spv
66
// RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o - | FileCheck %s --check-prefix=CHECK-LLVM

‎llvm-spirv/test/DebugInfo/DebugControlFlow.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -triple spir64-unknown-unknown -cl-std=CL2.0 -O0 -debug-info-kind=standalone -gno-column-info -emit-llvm %s -o %t.ll
1+
// RUN: %clang_cc1 -triple spir64-unknown-unknown -cl-std=CL2.0 -O0 -debug-info-kind=standalone -gno-column-info -emit-llvm %s -o %t.ll -no-opaque-pointers
22
// RUN: llvm-as %t.ll -o %t.bc
33
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spt
44
// RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

‎llvm-spirv/test/DebugInfo/DebugDeclareUnused.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Check that we can translate llvm.dbg.declare for a local variable which was
22
// deleted by mem2reg pass(disabled by default in llvm-spirv)
33

4-
// RUN: %clang_cc1 %s -triple spir -disable-llvm-passes -debug-info-kind=standalone -emit-llvm-bc -o - | llvm-spirv -spirv-mem2reg -o %t.spv
4+
// RUN: %clang_cc1 %s -triple spir -disable-llvm-passes -debug-info-kind=standalone -emit-llvm-bc -o - -no-opaque-pointers | llvm-spirv -spirv-mem2reg -o %t.spv
55
// RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
66
// RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o - | FileCheck %s --check-prefix=CHECK-LLVM
77

‎llvm-spirv/test/DebugInfo/DebugFunction.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// - Parent operand of DebugFunction is DebugCompileUnit, not an OpString, even
55
// if in LLVM IR it points to a DIFile instead of DICompileUnit.
66

7-
// RUN: %clang_cc1 %s -cl-std=clc++ -emit-llvm-bc -triple spir -debug-info-kind=line-tables-only -O0 -o - | llvm-spirv -o %t.spv
7+
// RUN: %clang_cc1 %s -cl-std=clc++ -emit-llvm-bc -triple spir -debug-info-kind=line-tables-only -O0 -o - -no-opaque-pointers | llvm-spirv -o %t.spv
88
// RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
99
// RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o - | FileCheck %s --check-prefix=CHECK-LLVM
1010

‎llvm-spirv/test/event_no_group_cap.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ __kernel void test_fn( const __global char *src)
22
{
33
wait_group_events(0, NULL);
44
}
5-
// RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -O0 -emit-llvm-bc %s -o %t.bc
5+
// RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -O0 -emit-llvm-bc %s -o %t.bc -no-opaque-pointers
66
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spt
77
// RUN: FileCheck < %t.spt %s
88
// RUN: llvm-spirv %t.bc -o %t.spv

‎llvm-spirv/test/image-unoptimized.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 %s -triple spir -O0 -emit-llvm-bc -o %t.bc
1+
// RUN: %clang_cc1 %s -triple spir -O0 -emit-llvm-bc -o %t.bc -no-opaque-pointers
22
// RUN: llvm-spirv %t.bc -o %t.spv
33
// RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s
44
// RUN: spirv-val %t.spv

‎llvm-spirv/test/mem2reg.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -O0 -S -triple spir-unknown-unknown -cl-std=CL2.0 -x cl -disable-O0-optnone %s -emit-llvm-bc -o %t.bc
1+
// RUN: %clang_cc1 -O0 -S -triple spir-unknown-unknown -cl-std=CL2.0 -x cl -disable-O0-optnone %s -emit-llvm-bc -o %t.bc -no-opaque-pointers
22
// RUN: llvm-spirv -s %t.bc
33
// RUN: llvm-dis < %t.bc | FileCheck %s --check-prefixes=CHECK,CHECK-WO
44
// RUN: llvm-spirv -s -spirv-mem2reg %t.bc -o %t.opt.bc

‎llvm-spirv/test/negative/InvalidAtomicBuiltins.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Check that translator doesn't generate atomic instructions for atomic builtins
22
// which are not defined in the spec.
33

4-
// RUN: %clang_cc1 -triple spir -O1 -cl-std=cl2.0 -fdeclare-opencl-builtins -finclude-default-header %s -emit-llvm-bc -o %t.bc
4+
// RUN: %clang_cc1 -triple spir -O1 -cl-std=cl2.0 -fdeclare-opencl-builtins -finclude-default-header %s -emit-llvm-bc -o %t.bc -no-opaque-pointers
55
// RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s
66
// RUN: llvm-spirv %t.bc -o %t.spv
77
// RUN: spirv-val %t.spv

0 commit comments

Comments
 (0)