Add Linux ARM64 native support (#61)

arm64 linux support
Signed-off-by: garyschulte <garyschulte@gmail.com>

Author: garyschulte

.circleci/config.yml

@@ -16,6 +16,15 @@ executors:
     environment:
       GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
       HOMEBREW_NO_AUTO_UPDATE: true
+  besu_executor_med_linux_arm64: # 2cpu, 8G ram
+    machine:
+      image: ubuntu-2004:current
+    resource_class: arm.medium
+    working_directory: ~/project
+    environment:
+      architecture: "arm64"
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
+
 # besu_executor_med_windows: # 2cpu, 4G ram
 #   machine:
 #     image: "windows-server-2019-vs2019:stable"
@@ -78,36 +87,75 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - altbn128/build/lib/*.so*
-            - bls12-381/build/lib/*.so*
-            - secp256k1/build/lib/*.so*
-            - ipa-multipoint/build/lib/*.so
-            - secp256r1/besu-native-ec/release/*.so
+            - altbn128/build/linux-gnu-x86_64/lib/*.so*
+            - bls12-381/build/linux-gnu-x86_64/lib/*.so*
+            - secp256k1/build/linux-gnu-x86_64/lib/*.so*
+            - ipa-multipoint/build/linux-gnu-x86_64/lib/*.so
+            - secp256r1/besu-native-ec/release/linux-gnu-x86_64/*.so
       - store_artifacts:
           name: Linux altbn128 native build artifacts
-          path:  altbn128/build/lib
+          path:  altbn128/build/linux-gnu-x86_64/lib
           destination: altbn128_linux_x86_64_native_artifacts
           when: always
       - store_artifacts:
           name: Linux bls12-381 native build artifacts
-          path:  bls12-381/build/lib
+          path:  bls12-381/build/linux-gnu-x86_64/lib
           destination: bls12_381_linux_x86_64_native_artifacts
           when: always
       - store_artifacts:
           name: Linux secp256k1 native build artifacts
-          path:  secp256k1/build/lib
+          path:  secp256k1/build/linux-gnu-x86_64/lib
           destination: secp256k1_linux_x86_64_native_artifacts
           when: always
       - store_artifacts:
           name: Linux secp256r1 native build artifacts
-          path:  secp256r1/besu-native-ec/release
+          path:  secp256r1/besu-native-ec/release/linux-gnu-x86_64
           destination: secp256r1_linux_x86_64_native_artifacts
           when: always
       - store_artifacts:
           name: Linux ipa-multipoint native build artifacts
-          path: ipa-multipoint/build/lib
+          path: ipa-multipoint/build/linux-gnu-x86_64/lib
           destination: ipa_multipoint_linux_x86_64_native_artifacts
           when: always
+
+  native-build-linux-aarch64:
+    executor: besu_executor_med_linux_arm64
+    environment:
+      SKIP_GRADLE: true
+    steps:
+      - checkout_code
+      - prepare_linux
+      - run:
+          name: build
+          command: |
+            ./build.sh
+      - persist_to_workspace:
+          root: .
+          paths:
+            - altbn128/build/linux-gnu-aarch64/lib/*.so*
+            - secp256k1/build/linux-gnu-aarch64/lib/*.so*
+            - ipa-multipoint/build/linux-gnu-aarch64/lib/*.so
+            - secp256r1/besu-native-ec/release/linux-gnu-aarch64/*.so
+      - store_artifacts:
+          name: Linux altbn128 native build artifacts
+          path:  altbn128/build/linux-gnu-aarch64/lib
+          destination: altbn128_linux_aarch64_native_artifacts
+          when: always
+      - store_artifacts:
+          name: Linux secp256k1 native build artifacts
+          path:  secp256k1/build/linux-gnu-aarch64/lib
+          destination: secp256k1_linux_aarch64_native_artifacts
+          when: always
+      - store_artifacts:
+          name: Linux secp256r1 native build artifacts
+          path:  secp256r1/besu-native-ec/release/linux-gnu-aarch64
+          destination: secp256r1_linux_aarch64_native_artifacts
+          when: always
+      - store_artifacts:
+          name: Linux ipa-multipoint native build artifacts
+          path: ipa-multipoint/build/linux-gnu-aarch64/lib
+          destination: ipa_multipoint_linux_aarch64_native_artifacts
+          when: always
   native-build-macos:
     executor: besu_executor_med_macos
     environment:
@@ -122,34 +170,34 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - altbn128/build/lib/*.*dylib*
-            - bls12-381/build/lib/*.*dylib*
-            - secp256k1/build/lib/*.*dylib*
-            - ipa-multipoint/build/lib/*.dylib
-            - secp256r1/besu-native-ec/release/*.dylib
+            - altbn128/build/darwin/lib/*.*dylib*
+            - bls12-381/build/darwin/lib/*.*dylib*
+            - secp256k1/build/darwin/lib/*.*dylib*
+            - ipa-multipoint/build/darwin/lib/*.dylib
+            - secp256r1/besu-native-ec/release/darwin/*.dylib
       - store_artifacts:
           name: macOS altbn128 native build artifacts
-          path:  altbn128/build/lib
+          path:  altbn128/build/darwin/lib
           destination: altbn128_macOS_native_artifacts
           when: always
       - store_artifacts:
           name: macOS bls12-381 native build artifacts
-          path:  bls12-381/build/lib
+          path:  bls12-381/build/darwin/lib
           destination: bls12_381_macOS_native_artifacts
           when: always
       - store_artifacts:
           name: macOS secp256k1 native build artifacts
-          path:  secp256k1/build/lib
+          path:  secp256k1/build/darwin/lib
           destination: secp256k1_macOS_native_artifacts
           when: always
       - store_artifacts:
           name: macOS secp256r1 native build artifacts
-          path:  secp256r1/besu-native-ec/release
+          path:  secp256r1/besu-native-ec/release/darwin
           destination: secp256r1_macOS_native_artifacts
           when: always
       - store_artifacts:
           name: macOS ipa-multipoint native build artifacts
-          path: ipa-multipoint/build/lib
+          path: ipa-multipoint/build/darwin/lib
           destination: ipa_multipoint_macOS_native_artifacts
           when: always
   final-assembly:
@@ -210,10 +258,12 @@ workflows:
   default:
     jobs:
       - native-build-linux-x86-64
+      - native-build-linux-aarch64
       - native-build-macos
       - final-assembly:
           requires:
             - native-build-linux-x86-64
+            - native-build-linux-aarch64
             - native-build-macos
       - publish:
           filters:

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
-# 0.4.4 (not released yet)
+# 0.5.0 (not released yet)
 
+* Add linux-arm64 native support [#61](https://github.com/hyperledger/besu-native/pull/61)
 * Add ipa-multipoint library support [#56](https://github.com/hyperledger/besu-native/pull/56)
 
 

altbn128/build.gradle

@@ -24,19 +24,26 @@ dependencies {
 }
 
 task macLibCopy(type: Copy) {
-  from 'build/lib/libeth_altbn128.dylib'
+  from 'build/darwin/lib/libeth_altbn128.dylib'
   into 'build/resources/main/darwin'
 }
 jar.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
-  from 'build/lib/libeth_altbn128.so'
+  from 'build/linux-gnu-x86_64/lib/libeth_altbn128.so'
   into 'build/resources/main/linux-x86-64'
 }
 jar.dependsOn linuxLibCopy
 
+task linuxArm64LibCopy(type: Copy) {
+  from 'build/linux-gnu-aarch64/lib/libeth_altbn128.so'
+  into 'build/resources/main/linux-aarch64'
+}
+jar.dependsOn linuxArm64LibCopy
+
 jar {
   archiveBaseName = 'besu-native-altbn128'
+  includeEmptyDirs = false
   manifest {
     attributes(
         'Specification-Title': archiveBaseName,

altbn128/sputnikvm_altbn128/Cargo.toml

@@ -10,6 +10,7 @@ edition = "2018"
 [dependencies]
 ethereum-bigint = { version = "0.2", default-features = false }
 bn-plus = { version = "0.4.4" }
+libc = "0.2"
 
 [lib]
 name = "eth_altbn128"

altbn128/sputnikvm_altbn128/src/lib.rs

@@ -17,10 +17,10 @@ pub extern "C" fn altbn128_add_precompiled(
     o: *mut ::std::os::raw::c_char,
     o_len: *mut u32,
 ) -> u32 {
-    let input_i8: &[i8] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
+    let input_i8: &[libc::c_char] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
     let input: &[u8] = unsafe { std::mem::transmute(input_i8) };
 
-    let raw_out_i8: &mut [i8] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
+    let raw_out_i8: &mut [libc::c_char] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
     let mut raw_out: &mut [u8] = unsafe { std::mem::transmute(raw_out_i8) };
 
     return match altbn128_add_precompiled_impl(input) {
@@ -88,10 +88,10 @@ pub extern "C" fn altbn128_mul_precompiled(
     o: *mut ::std::os::raw::c_char,
     o_len: *mut u32,
 ) -> u32 {
-    let input_i8: &[i8] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
+    let input_i8: &[libc::c_char] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
     let input: &[u8] = unsafe { std::mem::transmute(input_i8) };
 
-    let raw_out_i8: &mut [i8] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
+    let raw_out_i8: &mut [libc::c_char] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
     let mut raw_out: &mut [u8] = unsafe { std::mem::transmute(raw_out_i8) };
 
     return match altbn128_mul_precompiled_impl(input) {
@@ -151,10 +151,10 @@ pub extern "C" fn altbn128_pairing_precompiled(
     o: *mut ::std::os::raw::c_char,
     o_len: *mut u32,
 ) -> u32 {
-    let input_i8: &[i8] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
+    let input_i8: &[libc::c_char] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
     let input: &[u8] = unsafe { std::mem::transmute(input_i8) };
 
-    let raw_out_i8: &mut [i8] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
+    let raw_out_i8: &mut [libc::c_char] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
     let mut raw_out: &mut [u8] = unsafe { std::mem::transmute(raw_out_i8) };
 
     return match altbn128_pairing_precompiled_impl(input) {

bls12-381/build.gradle

@@ -28,19 +28,20 @@ dependencies {
 }
 
 task macLibCopy(type: Copy) {
-  from 'build/lib/libeth_pairings.dylib'
+  from 'build/darwin/lib/libeth_pairings.dylib'
   into 'build/resources/main/darwin'
 }
 jar.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
-  from 'build/lib/libeth_pairings.so'
+  from 'build/linux-gnu-x86_64/lib/libeth_pairings.so'
   into 'build/resources/main/linux-x86-64'
 }
 jar.dependsOn linuxLibCopy
 
 jar {
   archiveBaseName = 'besu-native-bls12-381'
+  includeEmptyDirs = false
   manifest {
     attributes(
         'Specification-Title': archiveBaseName,

build.sh

@@ -34,15 +34,16 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
-
 # Determine core count for parallel make
 if [[ "$OSTYPE" == "linux-gnu" ]];  then
   CORE_COUNT=$(nproc)
+  OSARCH=${OSTYPE%%[0-9.]*}-`arch`
 fi
 
 if [[ "$OSTYPE" == "darwin"* ]];  then
   export CFLAGS="-arch x86_64 -arch arm64"
   CORE_COUNT=$(sysctl -n hw.ncpu)
+  OSARCH="darwin"
 fi
 
 # add to path cargo
@@ -67,7 +68,7 @@ EOF
   fi
 
   ./autogen.sh && \
-    ./configure --prefix="$SCRIPTDIR/secp256k1/build" $SECP256K1_BUILD_OPTS && \
+    ./configure --prefix="$SCRIPTDIR/secp256k1/build/${OSARCH}" $SECP256K1_BUILD_OPTS && \
     make -j $CORE_COUNT && \
     make -j $CORE_COUNT install
 }
@@ -93,7 +94,8 @@ EOF
     cargo build --lib --release
   fi
 
-  cp target/release/libeth_altbn128.* "$SCRIPTDIR/altbn128/build/lib"
+  mkdir -p "$SCRIPTDIR/altbn128/build/${OSARCH}/lib"
+  cp target/release/libeth_altbn128.* "$SCRIPTDIR/altbn128/build/${OSARCH}/lib"
 }
 
 build_ipa_multipoint() {
@@ -107,7 +109,7 @@ EOF
 
   # delete old build dir, if exists
   rm -rf "$SCRIPTDIR/ipa-multipoint/build" || true
-  mkdir -p "$SCRIPTDIR/ipa-multipoint/build/lib"
+  mkdir -p "$SCRIPTDIR/ipa-multipoint/build/${OSARCH}/lib"
 
   cargo clean
 
@@ -117,7 +119,8 @@ EOF
     cargo build --lib --release
   fi
 
-  cp target/release/libipa_multipoint_jni.* "$SCRIPTDIR/ipa-multipoint/build/lib"
+  mkdir -p "$SCRIPTDIR/ipa-multipoint/build/${OSARCH}/lib"
+  cp target/release/libipa_multipoint_jni.* "$SCRIPTDIR/ipa-multipoint/build/${OSARCH}/lib"
 }
 
 build_bls12_381() {
@@ -127,19 +130,26 @@ build_bls12_381() {
   #############################
 EOF
 
-  cd "$SCRIPTDIR/bls12-381/matterlabs-eip1962"
-
-  # delete old build dir, if exists
-  rm -rf "$SCRIPTDIR/bls12-381/build" || true
-  mkdir -p "$SCRIPTDIR/bls12-381/build/lib"
-
-  cargo clean
-  if [[ "$OSTYPE" == "darwin"* ]];  then
-    lipo_lib "libeth_pairings" "--features eip_2357_c_api"
+  if [[ "${OSARCH}" != "linux-gnu-aarch64" ]]; then
+    echo "building bls12-381 for ${OSARCH}"
+    cd "$SCRIPTDIR/bls12-381/matterlabs-eip1962"
+
+    # delete old build dir, if exists
+    rm -rf "$SCRIPTDIR/bls12-381/build" || true
+    mkdir -p "$SCRIPTDIR/bls12-381/build/${OSARCH}/lib"
+
+    cargo clean
+    if [[ "$OSTYPE" == "darwin"* ]];  then
+      lipo_lib "libeth_pairings" "--features eip_2357_c_api"
+    else
+        cargo build --lib --features eip_2357_c_api --release
+    fi
+    mkdir -p "$SCRIPTDIR/bls12-381/build/${OSARCH}/lib"
+    cp target/release/libeth_pairings.* "$SCRIPTDIR/bls12-381/build/${OSARCH}/lib"
   else
-      cargo build --lib --features eip_2357_c_api --release
+    echo "skipping bls12-381 on ${OSARCH}"
   fi
-  cp target/release/libeth_pairings.* "$SCRIPTDIR/bls12-381/build/lib"
+
 }
 
 build_jars(){
@@ -217,12 +227,19 @@ EOF
     lipo -info ./release/libbesu_native_ec.dylib
     lipo -info ./release/libbesu_native_ec_crypto.dylib
   fi
+
+  mkdir -p "./release/${OSARCH}"
+  echo `pwd`
+  cp ./release/libbesu_native_ec* "./release/${OSARCH}/"
+
 }
 
 build_secp256k1
 build_altbn128
 build_bls12_381
 build_ipa_multipoint
 build_secp256r1
+
+
 build_jars
 exit