Skip to content

Commit 84a6b41

Browse files
svenvhKornevNikita
svenvh
authored and
KornevNikita
committed
Add -opaque-pointers=0 to remaining failing tests (#1788)
Fix the remaining tests that started failing after llvm-project commit e45cf47 ("[Bitcode] Remove auto-detection for typed pointers", 2022-12-14). This was done by mechanically adding `-opaque-pointers=0` to the `llvm-as`, `llvm-dis`, and `llvm-spirv %t.bc` `RUN` lines of the failing tests and then manually fixing up the `RUN` lines for any remaining failures. Original commit: KhronosGroup/SPIRV-LLVM-Translator@a326355
1 parent e73d07f commit 84a6b41

File tree

96 files changed

+299
-299
lines changed

Some content is hidden

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

96 files changed

+299
-299
lines changed

‎llvm-spirv/test/AtomicCompareExchange_cl20.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s
3-
; RUN: llvm-spirv %t.bc -o %t.spv
1+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
2+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 -spirv-text -o - | FileCheck %s
3+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 -o %t.spv
44
; RUN: spirv-val %t.spv
55

66
target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"

‎llvm-spirv/test/EnqueueEmptyKernel.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
;; 0, NULL, NULL,
1313
;; ^(){});
1414
;; }
15-
; RUN: llvm-as < %s > %t.bc
16-
; RUN: llvm-spirv %t.bc -o - -spirv-text | FileCheck %s --check-prefix=CHECK-SPIRV
17-
; RUN: llvm-spirv %t.bc -o %t.spv
15+
; RUN: llvm-as -opaque-pointers=0 < %s > %t.bc
16+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 -o - -spirv-text | FileCheck %s --check-prefix=CHECK-SPIRV
17+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 -o %t.spv
1818
; RUN: spirv-val %t.spv
1919

2020
target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"

‎llvm-spirv/test/ExtendBitBoolArg.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv -s %t.bc -o %t.regulzarized.bc
3-
; RUN: llvm-dis %t.regulzarized.bc -o %t.regulzarized.ll
1+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
2+
; RUN: llvm-spirv -s %t.bc -opaque-pointers=0 -o %t.regulzarized.bc
3+
; RUN: llvm-dis -opaque-pointers=0 %t.regulzarized.bc -o %t.regulzarized.ll
44
; RUN: FileCheck < %t.regulzarized.ll %s
55

66
; Translation cycle should be successfull:

‎llvm-spirv/test/SamplerArgNonKernel.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc -spirv-text -o %t.txt
1+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
2+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 -spirv-text -o %t.txt
33
; RUN: FileCheck < %t.txt %s
44
target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
55
target triple = "spir"

‎llvm-spirv/test/complex-constexpr.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc -o %t.spv
1+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
2+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 -o %t.spv
33
; RUN: llvm-spirv %t.spv -o %t.spt --to-text
44
; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.bc
55
; RUN: llvm-dis %t.bc -o %t.ll

‎llvm-spirv/test/extensions/INTEL/SPV_INTEL_arbitrary_precision_fixed_point/capability-arbitrary-precision-fixed-point-numbers.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
; return 0;
9393
; }
9494

95-
; RUN: llvm-as %s -o %t.bc
96-
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_arbitrary_precision_integers,+SPV_INTEL_arbitrary_precision_fixed_point -o %t.spv
95+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
96+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_arbitrary_precision_integers,+SPV_INTEL_arbitrary_precision_fixed_point -o %t.spv
9797
; RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
9898

99-
; RUN: not llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_arbitrary_precision_integers -spirv-text -o - 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
99+
; RUN: not llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_arbitrary_precision_integers -spirv-text -o - 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
100100
; CHECK-ERROR: InvalidInstruction: Can't translate llvm instruction:
101101
; CHECK-ERROR: Fixed point instructions can't be translated correctly without enabled SPV_INTEL_arbitrary_precision_fixed_point extension!
102102

‎llvm-spirv/test/extensions/INTEL/SPV_INTEL_blocking_pipes/PipeBlocking.ll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_blocking_pipes,+SPV_INTEL_arbitrary_precision_integers -spirv-text -o %t.spt
1+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
2+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_blocking_pipes,+SPV_INTEL_arbitrary_precision_integers -spirv-text -o %t.spt
33
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
44
; FIXME: add more negative test cases
55
; RUN: llvm-spirv %t.spt -to-binary -o %t.spv
66
; RUN: llvm-spirv -r %t.spv -o %t.bc
7-
; RUN: llvm-dis < %t.bc | FileCheck %s --check-prefix=CHECK-LLVM
7+
; RUN: llvm-dis -opaque-pointers=0 < %t.bc | FileCheck %s --check-prefix=CHECK-LLVM
88

99
; RUN: llvm-spirv -r %t.spv -o %t.bc --spirv-target-env=SPV-IR
10-
; RUN: llvm-dis < %t.bc | FileCheck %s --check-prefix=CHECK-SPV-IR
10+
; RUN: llvm-dis -opaque-pointers=0 < %t.bc | FileCheck %s --check-prefix=CHECK-SPV-IR
1111

1212
; ModuleID = 'test/CodeGenOpenCL/pipe_builtin.cl'
1313
source_filename = "test/CodeGenOpenCL/pipe_builtin.cl"

‎llvm-spirv/test/extensions/INTEL/SPV_INTEL_device_side_avc_motion_esimation/subgroup_avc_intel_generic.cl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: %clang_cc1 -O1 -triple spir-unknown-unknown -cl-std=CL2.0 %s -finclude-default-header -emit-llvm-bc -o %t.bc -no-opaque-pointers
2-
// RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.spv
2+
// RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.spv
33
// RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
44
// There is no validation for SPV_INTEL_device_side_avc_motion_estimation implemented in
55
// SPIRV-Tools. TODO: spirv-val %t.spv
66
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc
7-
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM
7+
// RUN: llvm-dis -opaque-pointers=0 < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM
88
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc --spirv-target-env=SPV-IR
9-
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM-SPIRV
10-
// RUN: llvm-spirv %t.rev.bc --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.spv
9+
// RUN: llvm-dis -opaque-pointers=0 < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM-SPIRV
10+
// RUN: llvm-spirv %t.rev.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.spv
1111
// RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
1212

1313
#pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : enable

‎llvm-spirv/test/extensions/INTEL/SPV_INTEL_device_side_avc_motion_esimation/subgroup_avc_intel_types.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
; intel_sub_group_avc_ime_dual_reference_streamin_t dstreamin = 0x0;
2020
; }
2121

22-
; RUN: llvm-as %s -o %t.bc
23-
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o - -spirv-text | FileCheck %s
22+
; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
23+
; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o - -spirv-text | FileCheck %s
2424

2525
; CHECK: Capability Groups
2626
; CHECK: Capability SubgroupAvcMotionEstimationINTEL

‎llvm-spirv/test/extensions/INTEL/SPV_INTEL_device_side_avc_motion_esimation/subgroup_avc_intel_vme_image.cl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: %clang_cc1 -O1 -triple spir-unknown-unknown -cl-std=CL2.0 %s -finclude-default-header -emit-llvm-bc -o %t.bc -no-opaque-pointers
2-
// RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.spv
2+
// RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.spv
33
// RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
44
// There is no validation for SPV_INTEL_device_side_avc_motion_estimation implemented in
55
// SPIRV-Tools. TODO: spirv-val %t.spv
66
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc
7-
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM
7+
// RUN: llvm-dis -opaque-pointers=0 < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM
88
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc --spirv-target-env=SPV-IR
9-
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM-SPIRV
10-
// RUN: llvm-spirv %t.rev.bc --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.rev.spv
9+
// RUN: llvm-dis -opaque-pointers=0 < %t.rev.bc | FileCheck %s --check-prefixes=CHECK-LLVM-COMMON,CHECK-LLVM-SPIRV
10+
// RUN: llvm-spirv %t.rev.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_device_side_avc_motion_estimation -o %t.rev.spv
1111
// RUN: llvm-spirv %t.rev.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
1212

1313
#pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : enable

0 commit comments

Comments
 (0)