From 96224d80ce94fe461088d6e6338627130625923d Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Fri, 11 Oct 2024 11:16:12 +1100
Subject: [PATCH] compiletest: Remove the magic hacks for finding output with
`lto=thin`
This hack was intended to handle the case where `-Clto=thin` causes the
compiler to emit multiple output files (when producing LLVM-IR or assembly).
The hack only affects 4 tests, of which 3 are just meta-tests for the hack
itself. The one remaining test that motivated the hack currently doesn't even
need it!
(`tests/codegen/issues/issue-81408-dllimport-thinlto-windows.rs`)
---
src/tools/compiletest/src/runtest.rs | 56 +++-------------------------
tests/assembly/thin-lto.rs | 7 ----
tests/codegen/thin-lto.rs | 6 ---
tests/coverage/thin-lto.cov-map | 8 ----
tests/coverage/thin-lto.coverage | 4 --
tests/coverage/thin-lto.rs | 3 --
6 files changed, 6 insertions(+), 78 deletions(-)
delete mode 100644 tests/assembly/thin-lto.rs
delete mode 100644 tests/codegen/thin-lto.rs
delete mode 100644 tests/coverage/thin-lto.cov-map
delete mode 100644 tests/coverage/thin-lto.coverage
delete mode 100644 tests/coverage/thin-lto.rs
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 256b88758f042..5e75a74a64c83 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1780,58 +1780,14 @@ impl<'test> TestCx<'test> {
proc_res.fatal(None, || on_failure(*self));
}
- fn get_output_file(&self, extension: &str) -> TargetLocation {
- let thin_lto = self.props.compile_flags.iter().any(|s| s.ends_with("lto=thin"));
- if thin_lto {
- TargetLocation::ThisDirectory(self.output_base_dir())
- } else {
- // This works with both `--emit asm` (as default output name for the assembly)
- // and `ptx-linker` because the latter can write output at requested location.
- let output_path = self.output_base_name().with_extension(extension);
-
- TargetLocation::ThisFile(output_path.clone())
- }
- }
-
- fn get_filecheck_file(&self, extension: &str) -> PathBuf {
- let thin_lto = self.props.compile_flags.iter().any(|s| s.ends_with("lto=thin"));
- if thin_lto {
- let name = self.testpaths.file.file_stem().unwrap().to_str().unwrap();
- let canonical_name = name.replace('-', "_");
- let mut output_file = None;
- for entry in self.output_base_dir().read_dir().unwrap() {
- if let Ok(entry) = entry {
- let entry_path = entry.path();
- let entry_file = entry_path.file_name().unwrap().to_str().unwrap();
- if entry_file.starts_with(&format!("{}.{}", name, canonical_name))
- && entry_file.ends_with(extension)
- {
- assert!(
- output_file.is_none(),
- "thinlto doesn't support multiple cgu tests"
- );
- output_file = Some(entry_file.to_string());
- }
- }
- }
- if let Some(output_file) = output_file {
- self.output_base_dir().join(output_file)
- } else {
- self.output_base_name().with_extension(extension)
- }
- } else {
- self.output_base_name().with_extension(extension)
- }
- }
-
// codegen tests (using FileCheck)
fn compile_test_and_save_ir(&self) -> (ProcRes, PathBuf) {
- let output_file = self.get_output_file("ll");
+ let output_path = self.output_base_name().with_extension("ll");
let input_file = &self.testpaths.file;
let rustc = self.make_compile_args(
input_file,
- output_file,
+ TargetLocation::ThisFile(output_path.clone()),
Emit::LlvmIr,
AllowUnused::No,
LinkToAux::Yes,
@@ -1839,12 +1795,13 @@ impl<'test> TestCx<'test> {
);
let proc_res = self.compose_and_run_compiler(rustc, None, self.testpaths);
- let output_path = self.get_filecheck_file("ll");
(proc_res, output_path)
}
fn compile_test_and_save_assembly(&self) -> (ProcRes, PathBuf) {
- let output_file = self.get_output_file("s");
+ // This works with both `--emit asm` (as default output name for the assembly)
+ // and `ptx-linker` because the latter can write output at requested location.
+ let output_path = self.output_base_name().with_extension("s");
let input_file = &self.testpaths.file;
let mut emit = Emit::None;
@@ -1867,7 +1824,7 @@ impl<'test> TestCx<'test> {
let rustc = self.make_compile_args(
input_file,
- output_file,
+ TargetLocation::ThisFile(output_path.clone()),
emit,
AllowUnused::No,
LinkToAux::Yes,
@@ -1875,7 +1832,6 @@ impl<'test> TestCx<'test> {
);
let proc_res = self.compose_and_run_compiler(rustc, None, self.testpaths);
- let output_path = self.get_filecheck_file("s");
(proc_res, output_path)
}
diff --git a/tests/assembly/thin-lto.rs b/tests/assembly/thin-lto.rs
deleted file mode 100644
index 7b67b2de1e63b..0000000000000
--- a/tests/assembly/thin-lto.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
-//@ only-x86_64-unknown-linux-gnu
-//@ assembly-output: emit-asm
-
-// CHECK: main
-
-pub fn main() {}
diff --git a/tests/codegen/thin-lto.rs b/tests/codegen/thin-lto.rs
deleted file mode 100644
index 4339d20532ea6..0000000000000
--- a/tests/codegen/thin-lto.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
-//@ only-x86_64-unknown-linux-gnu
-
-// CHECK: main
-
-pub fn main() {}
diff --git a/tests/coverage/thin-lto.cov-map b/tests/coverage/thin-lto.cov-map
deleted file mode 100644
index 1f61b805f622b..0000000000000
--- a/tests/coverage/thin-lto.cov-map
+++ /dev/null
@@ -1,8 +0,0 @@
-Function name: thin_lto::main
-Raw bytes (9): 0x[01, 01, 00, 01, 01, 03, 01, 00, 11]
-Number of files: 1
-- file 0 => global file 1
-Number of expressions: 0
-Number of file 0 mappings: 1
-- Code(Counter(0)) at (prev + 3, 1) to (start + 0, 17)
-
diff --git a/tests/coverage/thin-lto.coverage b/tests/coverage/thin-lto.coverage
deleted file mode 100644
index 5255aa7f5a408..0000000000000
--- a/tests/coverage/thin-lto.coverage
+++ /dev/null
@@ -1,4 +0,0 @@
- LL| |//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
- LL| |
- LL| 1|pub fn main() {}
-
diff --git a/tests/coverage/thin-lto.rs b/tests/coverage/thin-lto.rs
deleted file mode 100644
index 08843ea32ee18..0000000000000
--- a/tests/coverage/thin-lto.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
-
-pub fn main() {}