rewrite sepcomp-inlining and -separate to rmake.rs

src/tools/run-make-support/src/lib.rs

@@ -245,6 +245,28 @@ pub fn uname() -> String {
     output.stdout_utf8()
 }
 
+/// Inside a glob pattern of files (paths), read their contents and count the
+/// number of regex matches with a given expression (re).
+#[track_caller]
+pub fn count_regex_matches_in_file_glob(re: &str, paths: &str) -> usize {
+    let re =
+        regex::Regex::new(re).expect(format!("Regex expression {re} is not valid.").as_str());
+    let paths =
+        glob::glob(paths).expect(format!("Glob expression {paths} is not valid.").as_str());
+    let mut match_count = 0;
+    use io::BufRead;
+    paths.filter_map(|entry| entry.ok()).filter(|path| path.is_file()).for_each(|path| {
+        let file = fs_wrapper::open_file(path);
+        let reader = io::BufReader::new(file);
+        reader
+            .lines()
+            .filter_map(|line| line.ok())
+            .filter(|line| re.is_match(line))
+            .for_each(|_| match_count += 1);
+    });
+    match_count
+}
+
 fn handle_failed_output(cmd: &Command, output: CompletedProcess, caller_line_number: u32) -> ! {
     if output.status().success() {
         eprintln!("command unexpectedly succeeded at line {caller_line_number}");

src/tools/tidy/src/allowed_run_make_makefiles.txt

@@ -208,8 +208,6 @@ run-make/sanitizer-dylib-link/Makefile
 run-make/sanitizer-staticlib-link/Makefile
 run-make/separate-link-fail/Makefile
 run-make/separate-link/Makefile
-run-make/sepcomp-cci-copies/Makefile
-run-make/sepcomp-inlining/Makefile
 run-make/share-generics-dylib/Makefile
 run-make/silly-file-names/Makefile
 run-make/simd-ffi/Makefile

tests/run-make/sepcomp-cci-copies/rmake.rs

@@ -0,0 +1,13 @@
+// Check that cross-crate inlined items are inlined in all compilation units
+// that refer to them, and not in any other compilation units.
+// Note that we have to pass `-C codegen-units=6` because up to two CGUs may be
+// created for each source module (see `rustc_const_eval::monomorphize::partitioning`).
+// See https://github.com/rust-lang/rust/pull/16367
+
+use run_make_support::{count_regex_matches_in_file_glob, rustc};
+
+fn main() {
+    rustc().input("cci_lib.rs").run();
+    rustc().input("foo.rs").emit("llvm-ir").codegen_units(6).arg("-Zinline-in-all-cgus").run();
+    assert_eq!(count_regex_matches_in_file_glob(r#"define\ .*cci_fn"#, "foo.*.ll"), 2);
+}

tests/run-make/sepcomp-inlining/rmake.rs

@@ -0,0 +1,19 @@
+// Test that #[inline] functions still get inlined across compilation unit
+// boundaries. Compilation should produce three IR files, but only the two
+// compilation units that have a usage of the #[inline] function should
+// contain a definition. Also, the non-#[inline] function should be defined
+// in only one compilation unit.
+// See https://github.com/rust-lang/rust/pull/16367
+
+use run_make_support::{count_regex_matches_in_file_glob, glob, regex, rustc};
+
+fn main() {
+    rustc().input("foo.rs").emit("llvm-ir").codegen_units(3).arg("-Zinline-in-all-cgus").run();
+    assert_eq!(count_regex_matches_in_file_glob(r#"define\ i32\ .*inlined"#, "foo.*.ll"), 0);
+    assert_eq!(count_regex_matches_in_file_glob(r#"define\ internal\ .*inlined"#, "foo.*.ll"), 2);
+    assert_eq!(count_regex_matches_in_file_glob(r#"define\ hidden\ i32\ .*normal"#, "foo.*.ll"), 1);
+    assert_eq!(
+        count_regex_matches_in_file_glob(r#"declare\ hidden\ i32\ .*normal"#, "foo.*.ll"),
+        2
+    );
+}

tests/run-make/sepcomp-separate/rmake.rs

@@ -3,22 +3,9 @@
 // wind up in three different compilation units.
 // See https://github.com/rust-lang/rust/pull/16367
 
-use run_make_support::{fs_wrapper, glob, regex, rustc};
-use std::io::{BufRead, BufReader};
+use run_make_support::{count_regex_matches_in_file_glob, rustc};
 
 fn main() {
-    let mut match_count = 0;
     rustc().input("foo.rs").emit("llvm-ir").codegen_units(3).run();
-    let re = regex::Regex::new(r#"define.*magic_fn"#).unwrap();
-    let paths = glob::glob("foo.*.ll").unwrap();
-    paths.filter_map(|entry| entry.ok()).filter(|path| path.is_file()).for_each(|path| {
-        let file = fs_wrapper::open_file(path);
-        let reader = BufReader::new(file);
-        reader
-            .lines()
-            .filter_map(|line| line.ok())
-            .filter(|line| re.is_match(line))
-            .for_each(|_| match_count += 1);
-    });
-    assert_eq!(match_count, 3);
+    assert_eq!(count_regex_matches_in_file_glob(r#"define\ .*magic_fn"#, "foo.*.ll"), 3);
 }