Cross compile tools for ARM (aarch64)

.github/workflows/build-test.yml

@@ -51,7 +51,7 @@ jobs:
           name: perfspect
       - name: run test
         run: |
-          tar -xf perfspect*
+          tar -xf perfspect.tgz
           cp .github/mock_mlc perfspect/tools/x86_64/
           cd perfspect
           mkdir output

.gitignore

@@ -1,9 +1,12 @@
 /perfspect
+/perfspect-aarch64
 /perfspect.log
 /perfspect_202*
 /debug_out
 /tools/bin
+/tools/bin-aarch64
 /dist
 /internal/script/resources/x86_64
-/test
-/__debug_bin*.log
+/internal/script/resources/aarch64
+//test
+/__debug_bin*.log

Makefile

@@ -12,18 +12,24 @@ VERSION := $(VERSION_NUMBER)_$(COMMIT_DATE)_$(COMMIT_ID)
 
 default: perfspect
 
-GO=CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go
-GOFLAGS=-trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="-X perfspect/cmd.gVersion=$(VERSION) -s -w"
+GOFLAGS_COMMON=-trimpath -mod=readonly -ldflags="-X perfspect/cmd.gVersion=$(VERSION) -s -w"
+GO=CGO_ENABLED=0 GOOS=linux go
 
 # Build the perfspect binary
 .PHONY: perfspect
 perfspect:
-	$(GO) build $(GOFLAGS) -o $@
+	GOARCH=amd64 $(GO) build $(GOFLAGS_COMMON) -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -o $@
+
+# Build the perfspect binary for AARCH64
+.PHONY: perfspect-aarch64
+perfspect-aarch64:
+	GOARCH=arm64 $(GO) build $(GOFLAGS_COMMON) -o $@
 
 # Copy prebuilt tools to script resources
 .PHONY: resources
 resources:
 	mkdir -p internal/script/resources/x86_64
+	mkdir -p internal/script/resources/aarch64
 ifneq ("$(wildcard /prebuilt/tools)","") # /prebuilt/tools is a directory in the container
 	cp -r /prebuilt/tools/* internal/script/resources/x86_64
 else # copy dev system tools to script resources
@@ -33,20 +39,34 @@ else # no prebuilt tools found
 		@echo "No prebuilt tools found in /prebuilt/tools or tools/bin"
 endif
 endif
+ifneq ("$(wildcard /prebuild/tools/bin-aarch64)","")
+		cp -r tools/bin-aarch64/* internal/script/resources/aarch64
+else # copy dev system tools to script resources
+ifneq ("$(wildcard tools/bin-aarch64)","")
+		cp -r tools/bin-aarch64/* internal/script/resources/aarch64
+else # no prebuilt tools found
+		@echo "No prebuilt tools (aarch64) found in /prebuilt/tools or tools/bin-aarch64"
+endif
+endif
 
 
 # Build the distribution package
 .PHONY: dist
-dist: resources check perfspect
+dist: resources check perfspect perfspect-aarch64
 	rm -rf dist/perfspect
 	mkdir -p dist/perfspect/tools/x86_64
+	mkdir -p dist/perfspect/tools/aarch64
 	cp LICENSE dist/perfspect/
 	cp THIRD_PARTY_PROGRAMS dist/perfspect/
 	cp NOTICE dist/perfspect/
 	cp targets.yaml dist/perfspect/
 	cp perfspect dist/perfspect/
 	cd dist && tar -czf perfspect.tgz perfspect
 	cd dist && md5sum perfspect.tgz > perfspect.tgz.md5.txt
+	# for aarch64 dist, overwrite perfspect binary
+	cp perfspect-aarch64 dist/perfspect/perfspect
+	cd dist && tar -czf perfspect-aarch64.tgz perfspect
+	cd dist && md5sum perfspect-aarch64.tgz > perfspect-aarch64.tgz.md5.txt
 	rm -rf dist/perfspect
 	echo '{"version": "$(VERSION_NUMBER)", "date": "$(COMMIT_DATE)", "time": "$(COMMIT_TIME)", "commit": "$(COMMIT_ID)" }' | jq '.' > dist/manifest.json
 ifneq ("$(wildcard /prebuilt)","") # /prebuilt is a directory in the container
@@ -94,7 +114,7 @@ check_static:
 .PHONY: check_license
 check_license:
 	@echo "Confirming source files have license headers..."
-	@for f in `find . -type f ! -path './perfspect_202*' ! -path './tools/bin/*' ! -path './internal/script/resources/*' ! -path './scripts/.venv/*' ! -path './test/output/*' ! -path './debug_out/*' ! -path './tools/perf-archive/*' ! -path './tools/avx-turbo/*' \( -name "*.go" -o -name "*.s" -o -name "*.html" -o -name "Makefile" -o -name "*.sh" -o -name "*.Dockerfile" -o -name "*.py" \)`; do \
+	@for f in `find . -type f ! -path './perfspect_202*' ! -path './tools/bin/*' ! -path './tools/bin-aarch64/*' ! -path './internal/script/resources/*' ! -path './scripts/.venv/*' ! -path './test/output/*' ! -path './debug_out/*' ! -path './tools/perf-archive/*' ! -path './tools/avx-turbo/*' \( -name "*.go" -o -name "*.s" -o -name "*.html" -o -name "Makefile" -o -name "*.sh" -o -name "*.Dockerfile" -o -name "*.py" \)`; do \
 		if ! grep -E 'SPDX-License-Identifier: BSD-3-Clause' "$$f" >/dev/null; then echo "Error: license not found: $$f"; fail=1; fi; \
 	done; if [ -n "$$fail" ]; then exit 1; fi
 
@@ -150,3 +170,4 @@ clean: sweep
 	rm -f perfspect
 	sudo rm -rf dist
 	rm -rf internal/script/resources/x86_64/*
+	rm -rf internal/script/resources/aarch64/*

builder/build.sh

@@ -17,6 +17,7 @@ id=$(docker create perfspect-tools:$TAG foo)
 # Copy the tools from the temporary container to your local disk
 # Note: not used in build process, but useful to have around
 docker cp "$id":/bin ./tools
+docker cp "$id":/bin-aarch64 ./tools/bin-aarch64
 
 # Remove the temporary container
 docker rm "$id"