refactor: place all benchmarks in subdir

leon0399 · Jul 31, 2024 · 2492036 · 2492036
1 parent edfc74a
commit 2492036
Show file tree

Hide file tree

Showing 115 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/benchmark_on_change.yml b/.github/workflows/benchmark_on_change.yml
@@ -2,13 +2,19 @@ name: Run Benchmark on Change
 
 on:
   pull_request:
-    branches:
-      - master
+    paths: 
+      - 'langs/**/*'
+      - '.github/workflows/benchmark_on_change.yml'
+      - 'benchmark.py'
+      - 'run_on_changes.py'
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   benchmark:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
 
     permissions:
       pull-requests: read
@@ -33,7 +39,5 @@ jobs:
 
       - name: Run benchmarks for changed files
         if: steps.changed-files.outputs.any_changed == 'true'
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
         run: |
-          docker-compose run benchmark python3 ./run_on_changes.py $ALL_CHANGED_FILES
+          docker-compose run benchmark python3 ./run_on_changes.py ${{ steps.changed-files.outputs.all_changed_files }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -11,6 +11,9 @@ on:
     paths:
       - Dockerfile
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -50,7 +53,13 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
+          pull: true
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: |
+            ${{ steps.meta.outputs.tags }}
+            ghcr.io/${{ github.repository }}:latest
+            type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
diff --git a/benchmark.py b/benchmark.py
@@ -27,9 +27,9 @@
 configurations = []
 if args.languages:
     for language in args.languages:
-        configurations += glob.glob(language + '/benchmark.yml') + glob.glob(language + '/benchmark.yaml')
+        configurations += glob.glob('langs' + language + '/benchmark.yml') + glob.glob('langs' + language + '/benchmark.yaml')
 else:
-    configurations = glob.glob('*/benchmark.yml') + glob.glob('*/benchmark.yaml')
+    configurations = glob.glob('langs/*/benchmark.yml') + glob.glob('langs/*/benchmark.yaml')
 configurations.sort()
 
 scripts = ['*']

diff --git a/c-plus-plus/.gitignore → langs/c-plus-plus/.gitignore b/c-plus-plus/.gitignore → langs/c-plus-plus/.gitignore
diff --git a/c-plus-plus/Makefile → langs/c-plus-plus/Makefile b/c-plus-plus/Makefile → langs/c-plus-plus/Makefile
diff --git a/c-plus-plus/benchmark.yml → langs/c-plus-plus/benchmark.yml b/c-plus-plus/benchmark.yml → langs/c-plus-plus/benchmark.yml
diff --git a/c-plus-plus/collatz/MaxSequence.cpp → langs/c-plus-plus/collatz/MaxSequence.cpp b/c-plus-plus/collatz/MaxSequence.cpp → langs/c-plus-plus/collatz/MaxSequence.cpp
diff --git a/c-plus-plus/linpack/Linpack.cpp → langs/c-plus-plus/linpack/Linpack.cpp b/c-plus-plus/linpack/Linpack.cpp → langs/c-plus-plus/linpack/Linpack.cpp
diff --git a/c-plus-plus/mandelbrot/Simple.cpp → langs/c-plus-plus/mandelbrot/Simple.cpp b/c-plus-plus/mandelbrot/Simple.cpp → langs/c-plus-plus/mandelbrot/Simple.cpp
diff --git a/c-plus-plus/primes/Atkin.cpp → langs/c-plus-plus/primes/Atkin.cpp b/c-plus-plus/primes/Atkin.cpp → langs/c-plus-plus/primes/Atkin.cpp
diff --git a/c-plus-plus/primes/Simple.cpp → langs/c-plus-plus/primes/Simple.cpp b/c-plus-plus/primes/Simple.cpp → langs/c-plus-plus/primes/Simple.cpp
diff --git a/c-plus-plus/recursion/Tak.cpp → langs/c-plus-plus/recursion/Tak.cpp b/c-plus-plus/recursion/Tak.cpp → langs/c-plus-plus/recursion/Tak.cpp
diff --git a/c-plus-plus/treap/Naive.cpp → langs/c-plus-plus/treap/Naive.cpp b/c-plus-plus/treap/Naive.cpp → langs/c-plus-plus/treap/Naive.cpp
diff --git a/c-sharp/.gitignore → langs/c-sharp/.gitignore b/c-sharp/.gitignore → langs/c-sharp/.gitignore
diff --git a/c-sharp/Makefile → langs/c-sharp/Makefile b/c-sharp/Makefile → langs/c-sharp/Makefile
diff --git a/c-sharp/benchmark.yml → langs/c-sharp/benchmark.yml b/c-sharp/benchmark.yml → langs/c-sharp/benchmark.yml
diff --git a/c-sharp/mandelbrot/Simple.cs → langs/c-sharp/mandelbrot/Simple.cs b/c-sharp/mandelbrot/Simple.cs → langs/c-sharp/mandelbrot/Simple.cs
diff --git a/c/.gitignore → langs/c/.gitignore b/c/.gitignore → langs/c/.gitignore
diff --git a/c/Makefile → langs/c/Makefile b/c/Makefile → langs/c/Makefile
diff --git a/c/benchmark.yml → langs/c/benchmark.yml b/c/benchmark.yml → langs/c/benchmark.yml
diff --git a/c/primes/Simple.c → langs/c/primes/Simple.c b/c/primes/Simple.c → langs/c/primes/Simple.c
diff --git a/fortran/.gitignore → langs/fortran/.gitignore b/fortran/.gitignore → langs/fortran/.gitignore
diff --git a/fortran/Makefile → langs/fortran/Makefile b/fortran/Makefile → langs/fortran/Makefile
diff --git a/fortran/benchmark.yml → langs/fortran/benchmark.yml b/fortran/benchmark.yml → langs/fortran/benchmark.yml
diff --git a/fortran/primes/Simple.f90 → langs/fortran/primes/Simple.f90 b/fortran/primes/Simple.f90 → langs/fortran/primes/Simple.f90
diff --git a/go/.gitignore → langs/go/.gitignore b/go/.gitignore → langs/go/.gitignore
diff --git a/go/Makefile → langs/go/Makefile b/go/Makefile → langs/go/Makefile
diff --git a/go/benchmark.yml → langs/go/benchmark.yml b/go/benchmark.yml → langs/go/benchmark.yml
diff --git a/go/collatz/MaxSequence.go → langs/go/collatz/MaxSequence.go b/go/collatz/MaxSequence.go → langs/go/collatz/MaxSequence.go
diff --git a/go/linpack/Linpack.go → langs/go/linpack/Linpack.go b/go/linpack/Linpack.go → langs/go/linpack/Linpack.go
diff --git a/go/mandelbrot/Simple.go → langs/go/mandelbrot/Simple.go b/go/mandelbrot/Simple.go → langs/go/mandelbrot/Simple.go
diff --git a/go/primes/Atkin.go → langs/go/primes/Atkin.go b/go/primes/Atkin.go → langs/go/primes/Atkin.go
diff --git a/go/primes/Simple.go → langs/go/primes/Simple.go b/go/primes/Simple.go → langs/go/primes/Simple.go
diff --git a/go/recursion/Tak.go → langs/go/recursion/Tak.go b/go/recursion/Tak.go → langs/go/recursion/Tak.go
diff --git a/go/treap/Naive.go → langs/go/treap/Naive.go b/go/treap/Naive.go → langs/go/treap/Naive.go
diff --git a/java/.gitignore → langs/java/.gitignore b/java/.gitignore → langs/java/.gitignore
diff --git a/java/Makefile → langs/java/Makefile b/java/Makefile → langs/java/Makefile
diff --git a/java/benchmark.yml → langs/java/benchmark.yml b/java/benchmark.yml → langs/java/benchmark.yml
diff --git a/java/collatz/MaxSequence.java → langs/java/collatz/MaxSequence.java b/java/collatz/MaxSequence.java → langs/java/collatz/MaxSequence.java
diff --git a/java/linpack/Linpack.java → langs/java/linpack/Linpack.java b/java/linpack/Linpack.java → langs/java/linpack/Linpack.java
diff --git a/java/mandelbrot/Simple.java → langs/java/mandelbrot/Simple.java b/java/mandelbrot/Simple.java → langs/java/mandelbrot/Simple.java
diff --git a/java/primes/Atkin.java → langs/java/primes/Atkin.java b/java/primes/Atkin.java → langs/java/primes/Atkin.java
diff --git a/java/primes/Simple.java → langs/java/primes/Simple.java b/java/primes/Simple.java → langs/java/primes/Simple.java
diff --git a/java/recursion/Tak.java → langs/java/recursion/Tak.java b/java/recursion/Tak.java → langs/java/recursion/Tak.java
diff --git a/java/treap/Naive.java → langs/java/treap/Naive.java b/java/treap/Naive.java → langs/java/treap/Naive.java
diff --git a/javascript/benchmark.yml → langs/javascript/benchmark.yml b/javascript/benchmark.yml → langs/javascript/benchmark.yml
diff --git a/javascript/collatz/MaxSequence.js → langs/javascript/collatz/MaxSequence.js b/javascript/collatz/MaxSequence.js → langs/javascript/collatz/MaxSequence.js
diff --git a/javascript/linpack/Linpack.js → langs/javascript/linpack/Linpack.js b/javascript/linpack/Linpack.js → langs/javascript/linpack/Linpack.js
diff --git a/javascript/mandelbrot/Simple.js → langs/javascript/mandelbrot/Simple.js b/javascript/mandelbrot/Simple.js → langs/javascript/mandelbrot/Simple.js
diff --git a/javascript/primes/Atkin.js → langs/javascript/primes/Atkin.js b/javascript/primes/Atkin.js → langs/javascript/primes/Atkin.js
diff --git a/javascript/primes/Simple.js → langs/javascript/primes/Simple.js b/javascript/primes/Simple.js → langs/javascript/primes/Simple.js
diff --git a/javascript/recursion/Tak.js → langs/javascript/recursion/Tak.js b/javascript/recursion/Tak.js → langs/javascript/recursion/Tak.js
diff --git a/javascript/treap/Naive.js → langs/javascript/treap/Naive.js b/javascript/treap/Naive.js → langs/javascript/treap/Naive.js
diff --git a/kotlin/.gitignore → langs/kotlin/.gitignore b/kotlin/.gitignore → langs/kotlin/.gitignore
diff --git a/kotlin/Makefile → langs/kotlin/Makefile b/kotlin/Makefile → langs/kotlin/Makefile
diff --git a/kotlin/benchmark.yml → langs/kotlin/benchmark.yml b/kotlin/benchmark.yml → langs/kotlin/benchmark.yml
diff --git a/kotlin/primes/Simple-JVM.kt → langs/kotlin/primes/Simple-JVM.kt b/kotlin/primes/Simple-JVM.kt → langs/kotlin/primes/Simple-JVM.kt
diff --git a/kotlin/primes/Simple-Native.kt → langs/kotlin/primes/Simple-Native.kt b/kotlin/primes/Simple-Native.kt → langs/kotlin/primes/Simple-Native.kt
diff --git a/kotlin/treap/Naive-JVM.kt → langs/kotlin/treap/Naive-JVM.kt b/kotlin/treap/Naive-JVM.kt → langs/kotlin/treap/Naive-JVM.kt
diff --git a/kotlin/treap/Naive-Native.kt → langs/kotlin/treap/Naive-Native.kt b/kotlin/treap/Naive-Native.kt → langs/kotlin/treap/Naive-Native.kt
diff --git a/lua/benchmark.yml → langs/lua/benchmark.yml b/lua/benchmark.yml → langs/lua/benchmark.yml
diff --git a/lua/mandelbrot/Simple.lua → langs/lua/mandelbrot/Simple.lua b/lua/mandelbrot/Simple.lua → langs/lua/mandelbrot/Simple.lua
diff --git a/lua/primes/Simple.lua → langs/lua/primes/Simple.lua b/lua/primes/Simple.lua → langs/lua/primes/Simple.lua
diff --git a/lua/recursion/Tak.lua → langs/lua/recursion/Tak.lua b/lua/recursion/Tak.lua → langs/lua/recursion/Tak.lua
diff --git a/lua/treap/Naive.lua → langs/lua/treap/Naive.lua b/lua/treap/Naive.lua → langs/lua/treap/Naive.lua
diff --git a/perl/benchmark.yml → langs/perl/benchmark.yml b/perl/benchmark.yml → langs/perl/benchmark.yml
diff --git a/perl/primes/Simple.pl → langs/perl/primes/Simple.pl b/perl/primes/Simple.pl → langs/perl/primes/Simple.pl
diff --git a/perl/recursion/Tak.pl → langs/perl/recursion/Tak.pl b/perl/recursion/Tak.pl → langs/perl/recursion/Tak.pl
diff --git a/php/.gitignore → langs/php/.gitignore b/php/.gitignore → langs/php/.gitignore
diff --git a/php/Makefile → langs/php/Makefile b/php/Makefile → langs/php/Makefile
diff --git a/php/benchmark.yml → langs/php/benchmark.yml b/php/benchmark.yml → langs/php/benchmark.yml
diff --git a/php/collatz/MaxSequence.php → langs/php/collatz/MaxSequence.php b/php/collatz/MaxSequence.php → langs/php/collatz/MaxSequence.php
diff --git a/php/composer.json → langs/php/composer.json b/php/composer.json → langs/php/composer.json
diff --git a/php/composer.lock → langs/php/composer.lock b/php/composer.lock → langs/php/composer.lock
diff --git a/php/linpack/Linpack.php → langs/php/linpack/Linpack.php b/php/linpack/Linpack.php → langs/php/linpack/Linpack.php
diff --git a/php/mandelbrot/Simple.php → langs/php/mandelbrot/Simple.php b/php/mandelbrot/Simple.php → langs/php/mandelbrot/Simple.php
diff --git a/php/primes/Atkin.php → langs/php/primes/Atkin.php b/php/primes/Atkin.php → langs/php/primes/Atkin.php
diff --git a/php/primes/Simple.php → langs/php/primes/Simple.php b/php/primes/Simple.php → langs/php/primes/Simple.php
diff --git a/php/recursion/Tak.php → langs/php/recursion/Tak.php b/php/recursion/Tak.php → langs/php/recursion/Tak.php
diff --git a/php/treap/Naive.php → langs/php/treap/Naive.php b/php/treap/Naive.php → langs/php/treap/Naive.php
diff --git a/python/.gitignore → langs/python/.gitignore b/python/.gitignore → langs/python/.gitignore
diff --git a/python/benchmark.yml → langs/python/benchmark.yml b/python/benchmark.yml → langs/python/benchmark.yml
diff --git a/python/collatz/MaxSequence-Numba.py → langs/python/collatz/MaxSequence-Numba.py b/python/collatz/MaxSequence-Numba.py → langs/python/collatz/MaxSequence-Numba.py
diff --git a/python/collatz/MaxSequence.py → langs/python/collatz/MaxSequence.py b/python/collatz/MaxSequence.py → langs/python/collatz/MaxSequence.py
diff --git a/python/linpack/Linpack.py → langs/python/linpack/Linpack.py b/python/linpack/Linpack.py → langs/python/linpack/Linpack.py
diff --git a/python/mandelbrot/Simple-Numba.py → langs/python/mandelbrot/Simple-Numba.py b/python/mandelbrot/Simple-Numba.py → langs/python/mandelbrot/Simple-Numba.py
diff --git a/python/mandelbrot/Simple.py → langs/python/mandelbrot/Simple.py b/python/mandelbrot/Simple.py → langs/python/mandelbrot/Simple.py
diff --git a/python/primes/Atkin.py → langs/python/primes/Atkin.py b/python/primes/Atkin.py → langs/python/primes/Atkin.py
diff --git a/python/primes/Simple-Numba.py → langs/python/primes/Simple-Numba.py b/python/primes/Simple-Numba.py → langs/python/primes/Simple-Numba.py
diff --git a/python/primes/Simple.py → langs/python/primes/Simple.py b/python/primes/Simple.py → langs/python/primes/Simple.py
diff --git a/python/recursion/Tak-Numba.py → langs/python/recursion/Tak-Numba.py b/python/recursion/Tak-Numba.py → langs/python/recursion/Tak-Numba.py
diff --git a/python/recursion/Tak.py → langs/python/recursion/Tak.py b/python/recursion/Tak.py → langs/python/recursion/Tak.py
diff --git a/python/treap/Naive.py → langs/python/treap/Naive.py b/python/treap/Naive.py → langs/python/treap/Naive.py
diff --git a/ruby/benchmark.yml → langs/ruby/benchmark.yml b/ruby/benchmark.yml → langs/ruby/benchmark.yml
diff --git a/ruby/collatz/MaxSequence.rb → langs/ruby/collatz/MaxSequence.rb b/ruby/collatz/MaxSequence.rb → langs/ruby/collatz/MaxSequence.rb
diff --git a/ruby/mandelbrot/Simple.rb → langs/ruby/mandelbrot/Simple.rb b/ruby/mandelbrot/Simple.rb → langs/ruby/mandelbrot/Simple.rb
diff --git a/ruby/primes/Atkin.rb → langs/ruby/primes/Atkin.rb b/ruby/primes/Atkin.rb → langs/ruby/primes/Atkin.rb
diff --git a/ruby/primes/Simple.rb → langs/ruby/primes/Simple.rb b/ruby/primes/Simple.rb → langs/ruby/primes/Simple.rb
diff --git a/ruby/recursion/Tak.rb → langs/ruby/recursion/Tak.rb b/ruby/recursion/Tak.rb → langs/ruby/recursion/Tak.rb
diff --git a/ruby/treap/Naive.rb → langs/ruby/treap/Naive.rb b/ruby/treap/Naive.rb → langs/ruby/treap/Naive.rb
diff --git a/rust/.gitignore → langs/rust/.gitignore b/rust/.gitignore → langs/rust/.gitignore
diff --git a/rust/Makefile → langs/rust/Makefile b/rust/Makefile → langs/rust/Makefile
diff --git a/rust/benchmark.yml → langs/rust/benchmark.yml b/rust/benchmark.yml → langs/rust/benchmark.yml
diff --git a/rust/collatz/MaxSequence.rs → langs/rust/collatz/MaxSequence.rs b/rust/collatz/MaxSequence.rs → langs/rust/collatz/MaxSequence.rs
diff --git a/rust/mandelbrot/Simple.rs → langs/rust/mandelbrot/Simple.rs b/rust/mandelbrot/Simple.rs → langs/rust/mandelbrot/Simple.rs
diff --git a/rust/primes/Atkin.rs → langs/rust/primes/Atkin.rs b/rust/primes/Atkin.rs → langs/rust/primes/Atkin.rs
diff --git a/rust/primes/Simple.rs → langs/rust/primes/Simple.rs b/rust/primes/Simple.rs → langs/rust/primes/Simple.rs
diff --git a/swift/.gitignore → langs/swift/.gitignore b/swift/.gitignore → langs/swift/.gitignore
diff --git a/swift/Makefile → langs/swift/Makefile b/swift/Makefile → langs/swift/Makefile
diff --git a/swift/benchmark.yml → langs/swift/benchmark.yml b/swift/benchmark.yml → langs/swift/benchmark.yml
diff --git a/swift/primes/Simple.swift → langs/swift/primes/Simple.swift b/swift/primes/Simple.swift → langs/swift/primes/Simple.swift
diff --git a/zig/.gitignore → langs/zig/.gitignore b/zig/.gitignore → langs/zig/.gitignore
diff --git a/zig/Makefile → langs/zig/Makefile b/zig/Makefile → langs/zig/Makefile
diff --git a/zig/primes/Simple.zig → langs/zig/primes/Simple.zig b/zig/primes/Simple.zig → langs/zig/primes/Simple.zig
diff --git a/run_on_changes.py b/run_on_changes.py
@@ -9,15 +9,17 @@
 benchmark_commands = set()
 for file_path in changed_files:
     parts = file_path.split('/')
-    if len(parts) < 3:
+    if len(parts) < 4 or parts[0] != 'langs':
         continue  # Skip invalid paths
-    language, category, script = parts[0], parts[1], parts[2]
+    language, category, script = parts[1], parts[2], parts[3]
     script_name = script.split('.')[0]  # Extract script name without extension
     # Assuming the benchmark script supports language and script parameters
-    command = f"python3 ./benchmark.py --languages {language} --scripts {category}/{script_name} --times 1"
+    command = f"python3 ./benchmark.py run --languages {language} --scripts {category}/{script_name} --times 1"
     benchmark_commands.add(command)
 
 # Executing benchmark commands
 for command in benchmark_commands:
     print(f"Executing: {command}")
-    subprocess.run(command, shell=True)
+    result = subprocess.run(command, shell=True)
+    if result.returncode != 0:
+        sys.exit(f"Command failed: {command}")