[Backport to 15][NFC] Require spirv-as for spvasm tests (#2710) (#2786)

mateuszchudyk · jsji · web-flow · commit 7c09be0f041f · 2024-10-23T11:33:38.000+02:00
* [Backport to 15][NFC] Require spirv-as for spvasm tests (#2710) * [Backport to 15] Add missing requirement spirv-dis in GroupAndSubgroupInstructions.spvasm test (#2759) * [Backport to 15] Remove redundant requirement spirv-as in tu-member-opaque.spvasm test (#2757) * Remove redundant requirement spirv-as in tu-member-opaque.spvasm test * Correct the tu-member-opaque.spvasm test file extension --------- Co-authored-by: Jinsong Ji <jinsong.ji@intel.com>
diff --git a/test/DebugInfo/Generic/tu-member-opaque.spt b/test/DebugInfo/Generic/tu-member-opaque.spt
@@ -1,5 +1,3 @@
-; REQUIRES: spirv-as
-
 ; RUN: cat %s > %t.spvasm
 ; RUN: llvm-spirv %t.spvasm --to-binary -o %t.spv
 ; RUN: llvm-spirv -r %t.spv -o - | llvm-dis | FileCheck %s
diff --git a/test/GroupAndSubgroupInstructions.spvasm b/test/GroupAndSubgroupInstructions.spvasm
@@ -26,6 +26,8 @@
 ;   intel_sub_group_block_read(image, coord);
 ;   intel_sub_group_block_write(image, coord, c);
 ; }
+
+; REQUIRES: spirv-dis
 ; clang -cc1 -O2 -triple spir -cl-std=cl2.0 -finclude-default-header -cl-ext=+all source.cl -emit-llvm-bc -o tmp.bc
 ; llvm-spirv tmp.bc --spirv-ext=+all -o tmp.spv
 ; spirv-dis tmp.spv -o llvm-spirv/test/GroupAndSubgroupInstructions.spvasm
diff --git a/test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm b/test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm
@@ -1,3 +1,4 @@
+; REQUIRES: spirv-as
 ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s
 ; RUN: spirv-val %t.spv
 ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-; REQUIRES: spirv-as`
`2`		`-`
`3`	`1`	`; RUN: cat %s > %t.spvasm`
`4`	`2`	`; RUN: llvm-spirv %t.spvasm --to-binary -o %t.spv`
`5`	`3`	`; RUN: llvm-spirv -r %t.spv -o - \| llvm-dis \| FileCheck %s`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+; REQUIRES: spirv-as`
`1`	`2`	`; RUN: spirv-as --target-env spv1.0 -o %t.spv %s`
`2`	`3`	`; RUN: spirv-val %t.spv`
`3`	`4`	`; RUN: llvm-spirv -r -o - %t.spv \| llvm-dis \| FileCheck %s`