fix bench on macos and add ci (#209)

* fix bench on macos

* no rpath

* fix

* fix

* dbg

* ci

* fix

Author: edg-l

.github/workflows/ci.yml

@@ -170,6 +170,41 @@ jobs:
           run: sudo apt-get install llvm-19 llvm-19-dev llvm-19-runtime clang-19 clang-tools-19 lld-19 libpolly-19-dev libmlir-19-dev mlir-19-tools
         - name: Install Link deps
           run: sudo apt-get install libc-dev build-essential
+        - name: Run bench
+          run: ./bench/bench.sh | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' >> bench.md
+
+        - name: Find Bench Comment
+          continue-on-error: true
+          uses: peter-evans/find-comment@v3
+          id: fc
+          with:
+            issue-number: ${{ github.event.pull_request.number }}
+            comment-author: 'github-actions[bot]'
+            body-includes: Benchmarking (Linux)
+        - name: Create or update bench comment
+          continue-on-error: true
+          uses: peter-evans/create-or-update-comment@v4
+          with:
+            comment-id: ${{ steps.fc.outputs.comment-id }}
+            issue-number: ${{ github.event.pull_request.number }}
+            body-path: bench.md
+            edit-mode: replace
+    bench-macos:
+      name: Bench macOS
+      runs-on: macos-14
+      env:
+        CARGO_TERM_COLOR: always
+        LIBRARY_PATH: /opt/homebrew/lib
+        MLIR_SYS_190_PREFIX: /opt/homebrew/opt/llvm@19
+        LLVM_SYS_191_PREFIX: /opt/homebrew/opt/llvm@19
+        TABLEGEN_190_PREFIX: /opt/homebrew/opt/llvm@19
+      steps:
+        - uses: actions/checkout@v4
+        - name: Rustup toolchain install
+          uses: dtolnay/rust-toolchain@1.85.0
+        - uses: homebrew/actions/setup-homebrew@master
+        - name: install llvm
+          run: brew install llvm@19
         - name: Run bench
           run: ./bench/bench.sh | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' > bench.md
 
@@ -180,7 +215,7 @@ jobs:
           with:
             issue-number: ${{ github.event.pull_request.number }}
             comment-author: 'github-actions[bot]'
-            body-includes: Benchmarking
+            body-includes: Benchmarking (macOS)
         - name: Create or update bench comment
           continue-on-error: true
           uses: peter-evans/create-or-update-comment@v4

bench/bench.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <inttypes.h>
 
 extern uint64_t Bench_concrete_function_0(uint64_t n);
 
@@ -53,7 +54,7 @@ int main(int argc, const char **argv) {
       result_concrete = Bench_concrete_function_0(input);
     }
     long time_elapsed_nanos = timer_end(vartime);
-    printf("Concrete Result =\t%lu\t\tTime taken : %.2Lf ms\n", result_concrete,
+    printf("Concrete Result =\t %" PRIu64 "\t\tTime taken : %.2Lf ms\n", result_concrete,
            (long double)time_elapsed_nanos / 1000000.0L);
   }
 
@@ -63,7 +64,7 @@ int main(int argc, const char **argv) {
       result_rust = rust_function(input);
     }
     long time_elapsed_nanos = timer_end(vartime);
-    printf("Rust Result =\t\t%lu\t\tTime taken : %.2Lf ms\n", result_rust,
+    printf("Rust Result =\t\t %" PRIu64 "\t\tTime taken : %.2Lf ms\n", result_rust,
            (long double)time_elapsed_nanos / 1000000.0L);
   }
 

bench/bench.sh

@@ -7,19 +7,55 @@ cd "$(dirname "$0")"
 RED='\033[0;31m'
 NC='\033[0m' # No Color
 
-# name without extension, num_iters, input number
+unameOut="$(uname -s)"
+
+case "${unameOut}" in
+    Linux*)     libext=so;;
+    Darwin*)    libext=dylib;;
+    CYGWIN*)    libext=dll;;
+    MINGW*)     libext=dll;;
+    MSYS_NT*)   libext=dll;;
+    *)          libext="so"
+esac
+
 function bench_program() {
+    case "${unameOut}" in
+        Linux*)     bench_program_linux "$@";;
+        Darwin*)    bench_program_macos "$@";;
+        *) ;;
+    esac
+}
+
+# name without extension, num_iters, input number
+function bench_program_linux() {
     local name=$1
     local num_iters=$2
     local input=$3
 
-    echo -e "### ${RED}Benchmarking $name ${NC}"
+    echo -e "### ${RED}Benchmarking (Linux) $name ${NC}"
 
     rustc --crate-type=cdylib "$name.rs" -C target-cpu=native -C opt-level=3 -o "${name}_rs.so" > /dev/null 2>&1
     cargo r -- build "$name.con" --lib --release
     cp "$name.so" "${name}_con.so"
 
-    cc -march=native -mtune=native bench.c -L . -l:./"${name}"_rs.so -l:./"${name}"_con.so -Wl,-rpath -o bench_"${name}"
+    cc -march=native -mtune=native bench.c -L . -l:./"${name}"_rs.so -l:./"${name}"_con.so -o bench_"${name}"
+
+    ./bench_"${name}" "$num_iters" "$input"
+}
+
+function bench_program_macos() {
+    local name=$1
+    local num_iters=$2
+    local input=$3
+
+    echo -e "### ${RED}Benchmarking (macOS) $name ${NC}"
+
+    rustc --crate-type=cdylib "$name.rs" -C target-cpu=native -C opt-level=3 -o "${name}_rs.${libext}" > /dev/null 2>&1
+    cargo r -- build "$name.con" --lib --release
+    cp "$name.${libext}" "lib${name}_con.${libext}"
+    cp "${name}_rs.${libext}" "lib${name}_rs.${libext}"
+
+    cc -march=native -mtune=native bench.c -L . -l"${name}_con" -l"${name}"_rs -rpath . -o bench_"${name}"
 
     ./bench_"${name}" "$num_iters" "$input"
 }
@@ -45,4 +81,4 @@ bench_program "factorial" 5000000 20
 bench_program "fib" 5000 20
 
 # Cleanup
-rm ./*.so
+rm -rf ./*.{so,dylib}

src/driver/linker.rs

@@ -12,7 +12,6 @@ pub fn link_shared_lib(objects: &[PathBuf], output_filename: &Path) -> std::io::
         output_filename =
             output_filename.with_extension(CompileUnitInfo::get_platform_library_ext());
     }
-
     let output_filename = output_filename.to_string_lossy().to_string();
 
     let args: Vec<_> = {
@@ -21,13 +20,11 @@ pub fn link_shared_lib(objects: &[PathBuf], output_filename: &Path) -> std::io::
             let mut args = vec![
                 "-dynamic",
                 "-dylib",
-                "-mllvm",
                 "-L/usr/local/lib",
                 "-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib",
             ];
 
             args.extend(objects.iter().map(|x| x.as_str()));
-
             args.extend(&["-o", &output_filename, "-lSystem"]);
 
             args