Various changes

Please do not review. I need to work on this project alone.

Author: bjorn3

Cargo.lock

@@ -18,7 +18,7 @@ target-lexicon = "0.12.0"
 gimli = { version = "0.27", default-features = false, features = ["write"]}
 object = { version = "0.36", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
 
-eh_frame_experiments = { git = "ssh://git@github.com/bjorn3/eh_frame_experiments.git" }
+eh_frame_experiments = { git = "http://github.com/bjorn3/eh_frame_experiments.git" }
 indexmap = "2.0.0"
 libloading = { version = "0.8.0", optional = true }
 smallvec = "1.8.1"

Cargo.toml

@@ -79,6 +79,10 @@ const BASE_SYSROOT_SUITE: &[TestCase] = &[
     TestCase::build_bin_and_run("aot.alloc_example", "example/alloc_example.rs", &[]),
     TestCase::jit_bin("jit.std_example", "example/std_example.rs", "arg"),
     TestCase::build_bin_and_run("aot.std_example", "example/std_example.rs", &["arg"]),
+    TestCase::custom("aot.exception_bench", &|runner| {
+        runner.run_rustc(["example/exception_bench.rs", "--crate-name", "exception_bench_unwind"]);
+        runner.run_out_command("exception_bench_unwind", &[]);
+    }),
     TestCase::build_bin_and_run("aot.dst_field_align", "example/dst-field-align.rs", &[]),
     TestCase::build_bin_and_run(
         "aot.subslice-patterns-const-eval",
@@ -441,6 +445,7 @@ impl<'a> TestRunner<'a> {
         cmd.arg("--out-dir");
         cmd.arg(format!("{}", BUILD_EXAMPLE_OUT_DIR.to_path(&self.dirs).display()));
         cmd.arg("-Cdebuginfo=2");
+        cmd.arg("-Copt-level=3");
         cmd.arg("--target");
         cmd.arg(&self.target_compiler.triple);
         cmd.arg("-Zunstable-options");

build_system/tests.rs

@@ -34,17 +34,18 @@ testsuite.base_sysroot
 #build.alloc_system
 #aot.alloc_example
 #jit.std_example
-aot.std_example
-aot.dst_field_align
-aot.subslice-patterns-const-eval
-aot.track-caller-attribute
-aot.float-minmax-pass
-aot.mod_bench
-aot.issue-72793
-aot.issue-59326
-aot.polymorphize_coroutine
-aot.neon
-aot.gen_block_iterate
+#aot.std_example
+#aot.dst_field_align
+#aot.subslice-patterns-const-eval
+#aot.track-caller-attribute
+#aot.float-minmax-pass
+#aot.mod_bench
+#aot.issue-72793
+#aot.issue-59326
+#aot.polymorphize_coroutine
+#aot.neon
+#aot.gen_block_iterate
+aot.exception_bench
 
 #testsuite.extended_sysroot
 test.rust-random/rand

config.txt

@@ -0,0 +1,145 @@
+fn main() {
+    #[cfg(panic = "abort")]
+    println!("With panic=abort");
+
+    #[cfg(panic = "unwind")]
+    println!("With panic=unwind");
+
+    timed("100_000_000 nops", many_nops);
+    timed("100_000_000 calls", many_calls);
+    timed("    100_000 calls recursing 1000 frames", many_calls_recursive);
+    timed(
+        "    100_000 calls recursing 1000 frames with landingpad",
+        many_calls_recursive_with_landingpad,
+    );
+    #[cfg(panic = "unwind")]
+    timed("     10_000 throws catch unwinding few frame", many_throw_catch_few);
+    #[cfg(panic = "unwind")]
+    timed(
+        "     10_000 throws catch unwinding few frame with landingpad",
+        many_throw_catch_few_with_landingpad,
+    );
+    #[cfg(panic = "unwind")]
+    timed("      1_000 throws catch unwinding 100 frames", many_throw_catch_many);
+}
+
+fn timed(name: &str, f: fn()) {
+    let before = std::time::Instant::now();
+    f();
+    println!("{name} took {:?}", before.elapsed());
+}
+
+struct DropMe;
+
+impl Drop for DropMe {
+    #[inline(never)]
+    fn drop(&mut self) {}
+}
+
+fn many_nops() {
+    let mut i = 0;
+    while i < 100_000_000 {
+        // nop
+        i += 1;
+    }
+}
+
+fn many_calls() {
+    #[inline(never)]
+    fn callee() {}
+
+    let mut i = 0;
+    while i < 100_000_000 {
+        callee();
+        i += 1;
+    }
+}
+
+fn many_calls_recursive() {
+    #[inline(never)]
+    fn callee(i: u32) {
+        if i > 0 {
+            {
+                let _a = DropMe;
+                // Drop the DropMe outside of a landingpad
+            }
+            callee(i - 1);
+        }
+    }
+
+    let mut i = 0;
+    while i < 100_000 {
+        callee(1000);
+        i += 1;
+    }
+}
+
+fn many_calls_recursive_with_landingpad() {
+    #[inline(never)]
+    fn callee(i: u32) {
+        if i > 0 {
+            let _a = DropMe;
+            callee(i - 1);
+        }
+    }
+
+    let mut i = 0;
+    while i < 100_000 {
+        callee(1000);
+        i += 1;
+    }
+}
+
+fn many_throw_catch_few() {
+    #[inline(never)]
+    fn callee() {
+        std::panic::resume_unwind(Box::new(()));
+    }
+
+    let mut i = 0;
+    while i < 10_000 {
+        std::panic::catch_unwind(|| {
+            {
+                let _a = DropMe;
+                // Drop the DropMe outside of a landingpad
+            }
+            callee();
+        });
+        i += 1;
+    }
+}
+
+fn many_throw_catch_few_with_landingpad() {
+    #[inline(never)]
+    fn callee() {
+        std::panic::resume_unwind(Box::new(()));
+    }
+
+    let mut i = 0;
+    while i < 10_000 {
+        std::panic::catch_unwind(|| {
+            let _a = DropMe;
+            callee();
+        });
+        i += 1;
+    }
+}
+
+fn many_throw_catch_many() {
+    #[inline(never)]
+    fn callee(n: u32) {
+        if n == 0 {
+            std::panic::resume_unwind(Box::new(()));
+        } else {
+            callee(n - 1);
+        }
+    }
+
+    let mut i = 0;
+    while i < 1000 {
+        std::panic::catch_unwind(|| {
+            callee(100);
+        });
+        i += 1;
+    }
+}

example/exception_bench.rs

@@ -254,6 +254,9 @@ pub trait Destruct {}
 #[lang = "phantom_data"]
 pub struct PhantomData<T: ?Sized>;
 
+#[lang = "unpin"]
+pub auto trait Unpin {}
+
 #[lang = "panic"]
 #[track_caller]
 pub fn panic(_msg: &'static str) -> ! {

example/mini_core_hello_world.rs

@@ -32,6 +32,16 @@ rm tests/ui/parser/unclosed-delimiter-in-dep.rs # submodule contains //~ERROR
 # missing features
 # ================
 
+rm -r tests/run-make/bin-emit-no-symbols # wrong personality definition
+rm -r tests/run-make/foreign-double-unwind
+rm -r tests/run-make/issue-69368 # wrong personality definition
+rm -r tests/run-make/rustdoc-target-spec-json-path
+rm -r tests/run-make/std-core-cycle
+rm -r tests/run-make/c-unwind-abi-catch-lib-panic
+rm -r tests/run-make/no-alloc-shim
+rm tests/ui/extern-flag/auxiliary/panic_handler.rs
+rm tests/ui/panic-runtime/incompatible-type.rs
+
 # vendor intrinsics
 rm tests/ui/asm/x86_64/evex512-implicit-feature.rs # unimplemented AVX512 x86 vendor intrinsic
 rm tests/ui/simd/dont-invalid-bitcast-x86_64.rs # unimplemented llvm.x86.sse41.round.ps

scripts/test_rustc_tests.sh

@@ -413,7 +413,6 @@ pub(crate) fn codegen_terminator_call<'tcx>(
                     args,
                     ret_place,
                     target,
-                    unwind,
                     source_info,
                 ) {
                     Ok(()) => return,

src/abi/mod.rs

@@ -73,9 +73,23 @@ impl UnwindContext {
             module.define_data(personality_ref, &personality_ref_data).unwrap();
 
             cie.personality = Some((
-                gimli::DwEhPe(
-                    gimli::DW_EH_PE_indirect.0 | gimli::DW_EH_PE_pcrel.0 | gimli::DW_EH_PE_sdata8.0,
-                ),
+                if module.isa().triple().architecture == target_lexicon::Architecture::X86_64 {
+                    gimli::DwEhPe(
+                        gimli::DW_EH_PE_indirect.0
+                            | gimli::DW_EH_PE_pcrel.0
+                            | gimli::DW_EH_PE_sdata4.0,
+                    )
+                } else if let target_lexicon::Architecture::Aarch64(_) =
+                    module.isa().triple().architecture
+                {
+                    gimli::DwEhPe(
+                        gimli::DW_EH_PE_indirect.0
+                            | gimli::DW_EH_PE_pcrel.0
+                            | gimli::DW_EH_PE_sdata8.0,
+                    )
+                } else {
+                    todo!()
+                },
                 address_for_data(personality_ref),
             ));
             Some(frame_table.add_cie(cie))

src/debuginfo/unwind.rs

@@ -269,7 +269,6 @@ pub(crate) fn codegen_intrinsic_call<'tcx>(
     args: &[Spanned<mir::Operand<'tcx>>],
     destination: CPlace<'tcx>,
     target: Option<BasicBlock>,
-    unwind: UnwindAction,
     source_info: mir::SourceInfo,
 ) -> Result<(), Instance<'tcx>> {
     let intrinsic = fx.tcx.item_name(instance.def_id());
@@ -297,7 +296,6 @@ pub(crate) fn codegen_intrinsic_call<'tcx>(
             args,
             destination,
             target,
-            unwind,
             source_info,
         )?;
     }
@@ -442,7 +440,6 @@ fn codegen_regular_intrinsic_call<'tcx>(
     args: &[Spanned<mir::Operand<'tcx>>],
     ret: CPlace<'tcx>,
     destination: Option<BasicBlock>,
-    unwind: UnwindAction,
     source_info: mir::SourceInfo,
 ) -> Result<(), Instance<'tcx>> {
     assert_eq!(generic_args, instance.args);