compiletest: Require explicit --filecheck-prefixes

Author: tgross35

src/tools/compiletest/src/runtest.rs

@@ -2071,25 +2071,6 @@ impl<'test> TestCx<'test> {
         let mut filecheck = Command::new(self.config.llvm_filecheck.as_ref().unwrap());
         filecheck.arg("--input-file").arg(output).arg(&self.testpaths.file);
 
-        // Because we use custom prefixes, we also have to register the default prefix.
-        filecheck.arg("--check-prefix=CHECK");
-
-        // FIXME(#134510): auto-registering revision names as check prefix is a bit sketchy, and
-        // that having to pass `--allow-unused-prefix` is an unfortunate side-effect of not knowing
-        // whether the test author actually wanted revision-specific check prefixes or not.
-        //
-        // TL;DR We may not want to conflate `compiletest` revisions and `FileCheck` prefixes.
-
-        // HACK: tests are allowed to use a revision name as a check prefix.
-        if let Some(rev) = self.revision {
-            filecheck.arg("--check-prefix").arg(rev);
-        }
-
-        // HACK: the filecheck tool normally fails if a prefix is defined but not used. However,
-        // sometimes revisions are used to specify *compiletest* directives which are not FileCheck
-        // concerns.
-        filecheck.arg("--allow-unused-prefixes");
-
         // Provide more context on failures.
         filecheck.args(&["--dump-input-context", "100"]);
 

tests/assembly-llvm/aarch64-pointer-auth.rs

@@ -6,8 +6,11 @@
 //@ needs-llvm-components: aarch64
 //@ compile-flags: --target aarch64-unknown-linux-gnu
 //@ [PACRET] compile-flags: -Z branch-protection=pac-ret,leaf
+//@ [PACRET] filecheck-flags: --check-prefixes=PACRET
 //@ [PAUTHLR_NOP] compile-flags: -Z branch-protection=pac-ret,pc,leaf
+//@ [PAUTHLR_NOP] filecheck-flags: --check-prefixes=PAUTHLR_NOP
 //@ [PAUTHLR] compile-flags: -C target-feature=+pauth-lr -Z branch-protection=pac-ret,pc,leaf
+//@ [PAUTHLR] filecheck-flags: --check-prefixes=PAUTHLR
 
 #![feature(no_core, lang_items)]
 #![no_std]

tests/assembly-llvm/asm/arm-types.rs

@@ -7,6 +7,8 @@
 //@[d32] compile-flags: -C target-feature=+d32
 //@[neon] compile-flags: -C target-feature=+neon --cfg d32
 //@[neon] filecheck-flags: --check-prefix d32
+//@[d32] filecheck-flags: --check-prefixes=CHECK,d32
+//@[neon] filecheck-flags: --check-prefixes=CHECK,neon
 //@ needs-llvm-components: arm
 
 #![feature(no_core, repr_simd, f16)]

tests/assembly-llvm/asm/loongarch-type.rs

@@ -8,6 +8,7 @@
 
 //@[loongarch64] compile-flags: --target loongarch64-unknown-none
 //@[loongarch64] needs-llvm-components: loongarch
+//@[loongarch64] filecheck-flags: --check-prefixes=CHECK,loongarch64
 
 //@ compile-flags: -Zmerge-functions=disabled
 

tests/assembly-llvm/asm/mips-types.rs

@@ -5,6 +5,8 @@
 //@[mips32] needs-llvm-components: mips
 //@[mips64] compile-flags: --target mips64-unknown-linux-gnuabi64
 //@[mips64] needs-llvm-components: mips
+//@[mips32] filecheck-flags: --check-prefixes=CHECK,mips32
+//@[mips64] filecheck-flags: --check-prefixes=CHECK,mips64
 //@ compile-flags: -Zmerge-functions=disabled
 
 #![feature(no_core, asm_experimental_arch)]

tests/assembly-llvm/asm/powerpc-types.rs

@@ -4,12 +4,16 @@
 //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
 //@[powerpc] needs-llvm-components: powerpc
 //@[powerpc_altivec] compile-flags: --target powerpc-unknown-linux-gnu -C target-feature=+altivec --cfg altivec
+//@[powerpc_altivec] filecheck-flags: --check-prefixes=CHECK,powerpc_altivec
 //@[powerpc_altivec] needs-llvm-components: powerpc
 //@[powerpc_vsx] compile-flags: --target powerpc-unknown-linux-gnu -C target-feature=+altivec,+vsx --cfg altivec --cfg vsx
+//@[powerpc_vsx] filecheck-flags: --check-prefixes=CHECK,powerpc_vsx
 //@[powerpc_vsx] needs-llvm-components: powerpc
 //@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu --cfg altivec
+//@[powerpc64] filecheck-flags: --check-prefixes=CHECK,powerpc64
 //@[powerpc64] needs-llvm-components: powerpc
 //@[powerpc64_vsx] compile-flags: --target powerpc64-unknown-linux-gnu -C target-feature=+vsx --cfg altivec --cfg vsx
+//@[powerpc64_vsx] filecheck-flags: --check-prefixes=CHECK,powerpc64_vsx
 //@[powerpc64_vsx] needs-llvm-components: powerpc
 //@ compile-flags: -Zmerge-functions=disabled
 

tests/assembly-llvm/asm/riscv-types.rs

@@ -4,28 +4,30 @@
 
 //@[riscv64] compile-flags: --target riscv64imac-unknown-none-elf
 //@[riscv64] needs-llvm-components: riscv
+//@[riscv64] filecheck-flags: --check-prefixes=CHECK,riscv64
 
 //@[riscv32] compile-flags: --target riscv32imac-unknown-none-elf
 //@[riscv32] needs-llvm-components: riscv
 
 //@[riscv64-zfhmin] compile-flags: --target riscv64imac-unknown-none-elf --cfg riscv64
 //@[riscv64-zfhmin] needs-llvm-components: riscv
 //@[riscv64-zfhmin] compile-flags: -C target-feature=+zfhmin
-//@[riscv64-zfhmin] filecheck-flags: --check-prefix riscv64
+//@[riscv64-zfhmin] filecheck-flags: --check-prefixes=CHECK,riscv64
 
 //@[riscv32-zfhmin] compile-flags: --target riscv32imac-unknown-none-elf
 //@[riscv32-zfhmin] needs-llvm-components: riscv
 //@[riscv32-zfhmin] compile-flags: -C target-feature=+zfhmin
+//@[riscv32-zfhmin] filecheck-flags: --check-prefixes=CHECK,zfhmin
 
 //@[riscv64-zfh] compile-flags: --target riscv64imac-unknown-none-elf --cfg riscv64
 //@[riscv64-zfh] needs-llvm-components: riscv
 //@[riscv64-zfh] compile-flags: -C target-feature=+zfh
-//@[riscv64-zfh] filecheck-flags: --check-prefix riscv64 --check-prefix zfhmin
+//@[riscv64-zfh] filecheck-flags: --check-prefixes=CHECK,riscv64 --check-prefix zfhmin
 
 //@[riscv32-zfh] compile-flags: --target riscv32imac-unknown-none-elf
 //@[riscv32-zfh] needs-llvm-components: riscv
 //@[riscv32-zfh] compile-flags: -C target-feature=+zfh
-//@[riscv32-zfh] filecheck-flags: --check-prefix zfhmin
+//@[riscv32-zfh] filecheck-flags: --check-prefixes=CHECK,zfhmin
 
 //@ compile-flags: -C target-feature=+d
 //@ compile-flags: -Zmerge-functions=disabled

tests/assembly-llvm/asm/s390x-types.rs

@@ -5,6 +5,7 @@
 //@[s390x] needs-llvm-components: systemz
 //@[s390x_vector] compile-flags: --target s390x-unknown-linux-gnu -C target-feature=+vector
 //@[s390x_vector] needs-llvm-components: systemz
+//@[s390x_vector] filecheck-flags: --check-prefixes=CHECK,s390x_vector
 //@ compile-flags: -Zmerge-functions=disabled
 
 #![feature(no_core, repr_simd, f128)]

tests/assembly-llvm/asm/sparc-types.rs

@@ -7,6 +7,7 @@
 //@[sparcv8plus] needs-llvm-components: sparc
 //@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
 //@[sparc64] needs-llvm-components: sparc
+//@[sparc64] filecheck-flags: --check-prefixes=CHECK,sparc64
 //@ compile-flags: -Zmerge-functions=disabled
 
 #![feature(no_core, asm_experimental_arch)]

tests/assembly-llvm/asm/x86-modifiers.rs

@@ -6,6 +6,8 @@
 //@[x86_64] needs-llvm-components: x86
 //@[i686] compile-flags: --target i686-unknown-linux-gnu
 //@[i686] needs-llvm-components: x86
+//@[x86_64] filecheck-flags: --check-prefixes=CHECK,x86_64
+//@[i686] filecheck-flags: --check-prefixes=CHECK,i686
 //@ compile-flags: -C llvm-args=--x86-asm-syntax=intel
 //@ compile-flags: -C target-feature=+avx512bw
 //@ compile-flags: -Zmerge-functions=disabled