temp fix for mac M1 compile issues

Author: zac-williamson

barretenberg/CMakeLists.txt

@@ -16,6 +16,14 @@ option(MULTITHREADING "Enable multi-threading" ON)
 option(TESTING "Build tests" ON)
 option(BENCHMARKS "Build benchmarks" ON)
 option(PROFILING "Build profiling" ON)
+option(APPLE_M1 "Compile for Apple M1 CPUs" OFF)
+
+if(APPLE_M1)
+    set(MULTITHREADING OFF)
+    set(DISABLE_ASM ON)
+    set(DISABLE_ADX ON)
+    add_definitions(-DNDEBUG)
+endif()
 
 if(ARM)
     message(STATUS "Compiling for ARM.")
@@ -43,7 +51,6 @@ include(cmake/arch.cmake)
 include(cmake/threading.cmake)
 include(cmake/gtest.cmake)
 include(cmake/benchmark.cmake)
-include(cmake/build.cmake)
 include(cmake/module.cmake)
 
 add_subdirectory(src/aztec)

barretenberg/README.md

@@ -40,6 +40,14 @@ Just run the bootstrap script.
 ./bootstrap.sh
 ```
 
+N.B. FOR M1 MACS RUN THE FOLLOWING:
+
+```
+./bootstrap.sh APPLE_M1
+```
+
+The current build for M1 macs disables multithreading, which will affect performance.
+
 ### Parallelise the build
 
 Make sure your MAKEFLAGS environment variable is set to run jobs equal to number of cores. e.g. `MAKEFLAGS=-j32`.

barretenberg/bootstrap.sh

@@ -16,11 +16,21 @@ if [ ! -d ./srs_db/ignition ]; then
   cd ..
 fi
 
+appleM1="APPLE_M1"
+input=${1:foo}
+
 # Build native.
+if [ "$input" == "$appleM1" ]; then
+mkdir -p build && cd build
+cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. -DAPPLE_M1=1
+cmake --build . --parallel
+cd ..
+else
 mkdir -p build && cd build
 cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
 cmake --build . --parallel
 cd ..
+fi
 
 # Install the webassembly toolchain and patch runtime.
 if [ ! -d ./src/wasi-sdk-12.0 ]; then

barretenberg/cmake/arch.cmake

@@ -5,6 +5,6 @@ if(WASM)
     add_compile_options(-fno-exceptions -fno-slp-vectorize)
 endif()
 
-if(NOT WASM)
+if(NOT WASM AND NOT APPLE_M1)
     add_compile_options(-march=native)
 endif()

barretenberg/cmake/toolchains/x86_64-apple-clang.cmake

@@ -1,2 +1,8 @@
-set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
-set(CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang")
+if(APPLE_M1)
+    set(CMAKE_CXX_COMPILER "/opt/homebrew/opt/llvm/bin/clang++")
+    set(CMAKE_C_COMPILER "/opt/homebrew/opt/llvm/bin/clang")
+    set(DISABLE_ASM ON)
+else()
+    set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
+    set(CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang")
+endif()