Merge pull request #552 from davidhewitt/ctfe-stress-test-4

Migrate ctfe-stress-test-3 to ctfe-stress-test-4

Author: Mark-Simulacrum

collector/benchmarks/README.md

@@ -71,7 +71,7 @@ programs.
 - **coercions**: Contains a static array with 65,536 string literals, which
   caused [poor performance](https://github.com/rust-lang/rust/issues/32278) in
   the past.
-- **ctfe-stress-3**: A stress test for compile-time function evaluation.
+- **ctfe-stress-4**: A stress test for compile-time function evaluation.
 - **deeply-nested**: A small program that caused [exponential
   behavior](https://github.com/rust-lang/rust/issues/38528) in the past.
 - **deep-vector**: A test containing a single large vector of zeroes, which
@@ -94,4 +94,3 @@ programs.
   behavior](https://github.com/rust-lang/rust/pull/32062) in the past.
 - **unused-warnings**: Contains many unused imports, which caused [quadratic
   behavior](https://github.com/rust-lang/rust/issues/43572) in the past.
-

collector/benchmarks/ctfe-stress-3/Cargo.lock renamed to collector/benchmarks/ctfe-stress-4/Cargo.lock

@@ -1,4 +1,4 @@
 [package]
-name = "ctfe-stress-3"
+name = "ctfe-stress-4"
 version = "0.1.0"
 authors = ["Ralf Jung <[email protected]>"]

collector/benchmarks/ctfe-stress-3/Cargo.toml renamed to collector/benchmarks/ctfe-stress-4/Cargo.toml

@@ -2,6 +2,8 @@
 use std::mem::MaybeUninit;
 
 // Try to make CTFE actually do a lot of computation, without producing a big result.
+// The const fn expressions evaluated here take a dummy u32 argument because otherwise
+// const fn memoisation is able to eliminate a lot of the work.
 // And without support for loops.
 
 macro_rules! const_repeat {
@@ -17,27 +19,27 @@ macro_rules! const_repeat {
     }};
     // Recursive case: Take a 16
     ([16 $($n: tt)*] $e: expr, $T: ty) => {{
-        const fn e() -> $T { const_repeat!([$($n)*] $e, $T) }
-        e(); e(); e(); e();
-        e(); e(); e(); e();
-        e(); e(); e(); e();
-        e(); e(); e(); e()
+        const fn e(_: u32) -> $T { const_repeat!([$($n)*] $e, $T) }
+        e(0); e(0); e(0); e(0);
+        e(0); e(0); e(0); e(0);
+        e(0); e(0); e(0); e(0);
+        e(0); e(0); e(0); e(0)
     }};
     // Recursive case: Take a 8
     ([8 $($n: tt)*] $e: expr, $T: ty) => {{
-        const fn e() -> $T { const_repeat!([$($n)*] $e, $T) }
-        e(); e(); e(); e();
-        e(); e(); e(); e()
+        const fn e(_: u32) -> $T { const_repeat!([$($n)*] $e, $T) }
+        e(0); e(0); e(0); e(0);
+        e(0); e(0); e(0); e(0)
     }};
     // Recursive case: Take a 4
     ([4 $($n: tt)*] $e: expr, $T: ty) => {{
-        const fn e() -> $T { const_repeat!([$($n)*] $e, $T) }
-        e(); e(); e(); e()
+        const fn e(_: u32) -> $T { const_repeat!([$($n)*] $e, $T) }
+        e(0); e(0); e(0); e(0)
     }};
     // Recursive case: Take a 2
     ([2 $($n: tt)*] $e: expr, $T: ty) => {{
-        const fn e() -> $T { const_repeat!([$($n)*] $e, $T) }
-        e(); e()
+        const fn e(_: u32) -> $T { const_repeat!([$($n)*] $e, $T) }
+        e(0); e(0)
     }};
 }
 macro_rules! expensive_static {