Merge pull request #26 from rust-lang/make-benchmarks-reliable3

add workspace handling, cleanups

Author: ZuseZ4

enzyme/benchmarks/ReverseMode/adbench/gmm.h

@@ -268,7 +268,7 @@ int main(const int argc, const char* argv[]) {
 
     struct GMMOutput result = { 0, std::vector<double>(Jcols) };
 
-    if (0) {
+    if (1) {
       try {
         struct timeval start, end;
         gettimeofday(&start, NULL);
@@ -350,7 +350,7 @@ int main(const int argc, const char* argv[]) {
       test_suite["tools"].push_back(enzyme);
     }
     }
-    
+
     {
 
     struct GMMInput input;

enzyme/benchmarks/ReverseMode/adbench/lstm.h

@@ -245,7 +245,7 @@ int main(const int argc, const char* argv[]) {
 
     std::vector<std::string> paths = { "lstm_l2_c1024.txt", "lstm_l4_c1024.txt", "lstm_l2_c4096.txt", "lstm_l4_c4096.txt" };
     //std::vector<std::string> paths = { "lstm_l4_c4096.txt" };
-    
+
     std::ofstream jsonfile("results.json", std::ofstream::trunc);
     json test_results;
 
@@ -289,7 +289,7 @@ int main(const int argc, const char* argv[]) {
 
     }
 
-    if (0){
+    if (1){
 
      struct LSTMInput input = {};
 
@@ -385,7 +385,7 @@ int main(const int argc, const char* argv[]) {
         enzyme["result"].push_back(result.gradient[i]);
        }
        test_suite["tools"].push_back(enzyme);
-       
+
        printf("\n");
     }
     }
@@ -418,7 +418,7 @@ int main(const int argc, const char* argv[]) {
          enzyme["result"].push_back(result.gradient[i]);
        }
        test_suite["tools"].push_back(enzyme);
-       
+
        printf("\n");
     }
 

enzyme/benchmarks/ReverseMode/ba/Cargo.toml

@@ -21,3 +21,5 @@ lto = "fat"
 
 [dependencies]
 libm = { version = "0.2.8", optional = true }
+
+[workspace]

enzyme/benchmarks/ReverseMode/ba/Makefile.make

@@ -1,4 +1,4 @@
-# RUN: cd %S && LD_LIBRARY_PATH="%bldpath:$LD_LIBRARY_PATH" PTR="%ptr" BENCH="%bench" BENCHLINK="%blink" LOAD="%loadEnzyme" LOADCLANG="%loadClangEnzyme" ENZYME="%enzyme" make -B ba-raw.ll results.json -f %s
+# RUN: cd %S && LD_LIBRARY_PATH="%bldpath:$LD_LIBRARY_PATH" PTR="%ptr" BENCH="%bench" BENCHLINK="%blink" LOAD="%loadEnzyme" LOADCLANG="%loadClangEnzyme" ENZYME="%enzyme" make -B results.json -f %s
 
 .PHONY: clean
 

enzyme/benchmarks/ReverseMode/fft/Cargo.toml

@@ -20,3 +20,5 @@ strip = true
 
 [profile.dev]
 lto = "fat"
+
+[workspace]

enzyme/benchmarks/ReverseMode/gmm/Cargo.toml

@@ -24,3 +24,5 @@ lto = "fat"
 
 [dependencies]
 libm = { version = "0.2.8", optional = true }
+
+[workspace]

enzyme/benchmarks/ReverseMode/gmm/src/safe.rs

@@ -19,9 +19,9 @@ fn lgamma(x: f64) -> f64 {
 
 #[no_mangle]
 pub extern "C" fn rust_dgmm_objective(
-    d: i32,
-    k: i32,
-    n: i32,
+    d: usize,
+    k: usize,
+    n: usize,
     alphas: *const f64,
     dalphas: *mut f64,
     means: *const f64,
@@ -33,9 +33,6 @@ pub extern "C" fn rust_dgmm_objective(
     err: *mut f64,
     derr: *mut f64,
 ) {
-    let k = k as usize;
-    let n = n as usize;
-    let d = d as usize;
     let alphas = unsafe { std::slice::from_raw_parts(alphas, k) };
     let means = unsafe { std::slice::from_raw_parts(means, k * d) };
     let icf = unsafe { std::slice::from_raw_parts(icf, k * d * (d + 1) / 2) };
@@ -85,19 +82,16 @@ pub extern "C" fn rust_dgmm_objective(
 
 #[no_mangle]
 pub extern "C" fn rust_gmm_objective(
-    d: i32,
-    k: i32,
-    n: i32,
+    d: usize,
+    k: usize,
+    n: usize,
     alphas: *const f64,
     means: *const f64,
     icf: *const f64,
     x: *const f64,
     wishart: *const Wishart,
     err: *mut f64,
 ) {
-    let k = k as usize;
-    let n = n as usize;
-    let d = d as usize;
     let alphas = unsafe { std::slice::from_raw_parts(alphas, k) };
     let means = unsafe { std::slice::from_raw_parts(means, k * d) };
     let icf = unsafe { std::slice::from_raw_parts(icf, k * d * (d + 1) / 2) };

enzyme/benchmarks/ReverseMode/lstm/Cargo.toml

@@ -20,3 +20,5 @@ strip = true
 
 [profile.dev]
 lto = "fat"
+
+[workspace]

enzyme/benchmarks/ReverseMode/lstm/Makefile.make

@@ -1,4 +1,4 @@
-# RUN: cd %S && LD_LIBRARY_PATH="%bldpath:$LD_LIBRARY_PATH" PTR="%ptr" BENCH="%bench" BENCHLINK="%blink" LOAD="%loadEnzyme" LOADCLANG="%loadClangEnzyme" ENZYME="%enzyme" make -B lstm-raw.ll results.json -f %s
+# RUN: cd %S && LD_LIBRARY_PATH="%bldpath:$LD_LIBRARY_PATH" PTR="%ptr" BENCH="%bench" BENCHLINK="%blink" LOAD="%loadEnzyme" LOADCLANG="%loadClangEnzyme" ENZYME="%enzyme" make -B results.json -f %s
 
 .PHONY: clean
 
@@ -41,7 +41,6 @@ $(dir)/benchmarks/ReverseMode/lstm/target/release/liblstm.a: src/lib.rs Cargo.to
 
 lstm.o: lstm-opt.ll $(dir)/benchmarks/ReverseMode/lstm/target/release/liblstm.a
 	$(CLANG) -pthread -O3 $^ -o $@ $(BENCHLINK) -lm
-	#$(CLANG) -pthread -O3 -fno-math-errno $^ -o $@ $(BENCHLINK) -lm
 
 results.json: lstm.o
 	numactl -C 1 ./$^

enzyme/benchmarks/ReverseMode/ode-real/Cargo.toml

@@ -20,3 +20,5 @@ strip = true
 
 [profile.dev]
 lto = "fat"
+
+[workspace]

enzyme/benchmarks/ReverseMode/ode-real/Makefile.make

@@ -1,4 +1,4 @@
-# RUN: cd %S && LD_LIBRARY_PATH="%bldpath:$LD_LIBRARY_PATH" PTR="%ptr" BENCH="%bench" BENCHLINK="%blink" LOAD="%loadEnzyme" ENZYME="%enzyme" make -B ode-raw.ll ode-opt.ll results.json VERBOSE=1 -f %s
+# RUN: cd %S && LD_LIBRARY_PATH="%bldpath:$LD_LIBRARY_PATH" PTR="%ptr" BENCH="%bench" BENCHLINK="%blink" LOAD="%loadEnzyme" ENZYME="%enzyme" make -B results.json VERBOSE=1 -f %s
 
 .PHONY: clean