CI: add aarch64

etc/DependencyInstaller.sh

@@ -39,14 +39,14 @@ _installCommon() {
     baseDir=$(mktemp -d /tmp/DependencyInstaller-orfs-XXXXXX)
 
     # Install Verilator
-    verilatorPrefix=`realpath ${PREFIX:-"/usr/local"}`
+    verilatorPrefix="$(realpath ${PREFIX:-/usr/local})"
     if [[ ! -x ${verilatorPrefix}/bin/verilator ]]; then
         pushd $baseDir
             git clone --depth=1 -b "v$verilatorVersion" https://github.com/verilator/verilator.git
             pushd verilator
                 autoconf
                 ./configure --prefix "${verilatorPrefix}"
-                make -j`nproc`
+                make -j $(nproc)
                 make install
             popd
             rm -r verilator
@@ -67,16 +67,16 @@ _installCentosPackages() {
         ruby-devel
 
     if ! [ -x "$(command -v klayout)" ]; then
-      yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
-    else
-      currentVersion=$(klayout -v | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
-      if _versionCompare $currentVersion -ge $klayoutVersion; then
-        echo "KLayout version greater than or equal to ${klayoutVersion}"
-      else
-        echo "KLayout version less than ${klayoutVersion}"
-        sudo yum remove -y klayout
         yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
-      fi
+    else
+        currentVersion=$(klayout -v | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+        if _versionCompare $currentVersion -ge $klayoutVersion; then
+            echo "KLayout version greater than or equal to ${klayoutVersion}"
+        else
+            echo "KLayout version less than ${klayoutVersion}"
+            sudo yum remove -y klayout
+            yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
+        fi
     fi
 }
 
@@ -90,11 +90,12 @@ _installKlayoutDependenciesUbuntuAarch64() {
     export DEBIAN_FRONTEND=noninteractive
     apt-get -y update
     apt-get -y install  build-essential \
-                        qtbase5-dev qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5svg5-dev \
-                        ruby ruby-dev \
-                        python3 python3-dev \
-                        libz-dev\
-                        libgit2-dev
+        qtbase5-dev qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5svg5-dev \
+        ruby ruby-dev \
+        python3 python3-dev \
+        libz-dev\
+        libgit2-dev
+
     echo "All dependencies installed successfully"
 }
 
@@ -133,19 +134,19 @@ _installUbuntuPackages() {
         lastDir="$(pwd)"
         # temp dir to download and compile
         baseDir=/tmp/installers
-        klayoutPrefix=${PREFIX:-"/usr/local"}
+        klayoutPrefix=${PREFIX:-"/usr/local/bin"}
         mkdir -p "${baseDir}"
         cd "${baseDir}"
         if [[ $arch == "aarch64" ]]; then
             if [ ! -f ${klayoutPrefix}/klayout ]; then
                 _installKlayoutDependenciesUbuntuAarch64
                 echo "Installing KLayout for aarch64 architecture"
-                git clone https://github.com/KLayout/klayout.git
+                git clone --depth=1 -b "v${klayoutVersion}" https://github.com/KLayout/klayout.git
                 cd klayout
-                ./build.sh -bin "${klayoutPrefix}"
+                ./build.sh -prefix "${klayoutPrefix}" -j $(nproc)
             else
                 echo "Klayout is already installed"
-        fi
+            fi
         else
             if [[ $1 == 20.04 ]]; then
                 klayoutChecksum=15a26f74cf396d8a10b7985ed70ab135
@@ -164,6 +165,7 @@ _installUbuntuPackages() {
     install -m 0755 -d /etc/apt/keyrings
     curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
         -o /etc/apt/keyrings/docker.asc
+
     chmod a+r /etc/apt/keyrings/docker.asc
 
     # Add the repository to Apt sources:
@@ -195,7 +197,9 @@ _installCI() {
         coreutils \
         curl \
         python3 \
-        software-properties-common
+        software-properties-common \
+        unzip \
+        wget
 }
 
 _help() {

etc/DockerTag.sh

@@ -17,10 +17,11 @@ if [[ "$@" == "-dev" ]]; then
         "./tools/OpenROAD/etc/DockerHelper.sh"
         "./tools/OpenROAD/etc/DockerTag.sh"
     )
-    cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}'
+    ret=$(cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}')
 elif [[ "$@" == "-master" ]]; then
-    git describe
+    ret=$(git describe)
 else
     echo "Usage: $0 {-dev|-master}"
     exit 1
 fi
+echo "${ret}-$(uname -m)"

jenkins/public_tests_all.Jenkinsfile

@@ -1,50 +1,53 @@
-@Library('utils@orfs-v2.1.0') _
+@Library('utils@orfs-arm') _
 
 node {
 
+    def DOCKER_IMAGE;
     properties([copyArtifactPermission('${JOB_NAME},'+env.BRANCH_NAME)]);
 
-    stage('Checkout') {
-        if (env.BRANCH_NAME && env.BRANCH_NAME == 'master') {
-            checkout([
-                    $class: 'GitSCM',
-                    branches: [[name: scm.branches[0].name]],
-                    doGenerateSubmoduleConfigurations: false,
-                    extensions: [
-                    [$class: 'CloneOption', noTags: false],
-                    [$class: 'SubmoduleOption', recursiveSubmodules: true]
-                    ],
-                    submoduleCfg: [],
-                    userRemoteConfigs: scm.userRemoteConfigs
-            ]);
+    Map archs = [failFast: false];
+
+    archs['x86'] = {
+        stage('Checkout') {
+            if (env.BRANCH_NAME && env.BRANCH_NAME == 'master') {
+                checkout([
+                        $class: 'GitSCM',
+                        branches: [[name: scm.branches[0].name]],
+                        doGenerateSubmoduleConfigurations: false,
+                        extensions: [
+                        [$class: 'CloneOption', noTags: false],
+                        [$class: 'SubmoduleOption', recursiveSubmodules: true]
+                        ],
+                        submoduleCfg: [],
+                        userRemoteConfigs: scm.userRemoteConfigs
+                ]);
+            }
+            else {
+                checkout scm;
+            }
+            def description = sh(script: "git log -1 --pretty=%B", returnStdout: true).trim();
+            if (description.contains('ci') && description.contains('skip')) {
+                currentBuild.result = 'SKIPPED'; // 'SUCCESS', 'SKIPPED'
+                return;
+            }
         }
-        else {
-            checkout scm;
+        stage('Build and Push Docker Image') {
+            DOCKER_IMAGE = dockerPush('ubuntu22.04', 'orfs');
+            echo "Docker image is $DOCKER_IMAGE";
         }
-        def description = sh(script: "git log -1 --pretty=%B", returnStdout: true).trim();
-        if (description.contains('ci') && description.contains('skip')) {
-            currentBuild.result = 'SKIPPED'; // 'SUCCESS', 'SKIPPED'
-            return;
+        stage('Build ORFS and Stash bins') {
+            buildBins(DOCKER_IMAGE);
+        }
+        stage('Run Tests') {
+            runTests(DOCKER_IMAGE, 'dev');
         }
     }
 
-    def DOCKER_IMAGE;
-    stage('Build and Push Docker Image') {
-        DOCKER_IMAGE = dockerPush('ubuntu22.04', 'orfs');
-        echo "Docker image is $DOCKER_IMAGE";
-    }
-
-    stage('Build ORFS and Stash bins') {
-        buildBins(DOCKER_IMAGE);
+    archs['aarch64'] = {
+        aarch64();
     }
 
-    stage('Run Tests') {
-        if (env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('ci-dev')) {
-            runTests(DOCKER_IMAGE, 'dev');
-        } else {
-            runTests(DOCKER_IMAGE, 'pr');
-        }
-    }
+    parallel(archs);
 
     stage ('Cleanup and Reporting') {
         finalReport(DOCKER_IMAGE);