From 446b9f536f63d2f35833dc8be41f58072619b5f6 Mon Sep 17 00:00:00 2001 From: neodiX42 Date: Fri, 30 Dec 2022 09:13:10 -0800 Subject: [PATCH] Ignore usage of AVX512 and force AVX2 CPU instructions for better binaries' portability. (#580) * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * build storage-daemon and storage-daemon-cli binaries * force GSL 2.7.1 version * force GSL 2.7.1 version * handle missing BLAS library * handle missing BLAS library, force GSL 2.7.1 version, build storage-daemon and storage-daemon-cli binaries * Revert "handle missing BLAS library" This reverts commit 67ebd4abfaa667204c6c9717d9593c2274e38a99. * remove GSL * remove GSL only for 18.04 * remove GSL only for 18.04 * link blas library; leave gsl * merge upstream * make more portable binaries by excluding AVX512 CPU flag * make rocksdb to produce portable binaries * make rocksdb to produce portable binaries * make rocksdb to produce portable binaries * show OS CPU flags & force AVX2 * DPORTABLE=1 and -DTON_ARCH= * DPORTABLE=1 and -DTON_ARCH= and -DCMAKE_CXX_FLAGS="-mavx2" * DPORTABLE=1 and -DTON_ARCH= and -DCMAKE_CXX_FLAGS="-mavx2" * DPORTABLE=1 and -DCMAKE_CXX_FLAGS="-mavx2" only * Ignore usage of AVX512 and force AVX2 CPU instructions for better binaries portability. * Ignore usage of AVX512 and force AVX2 CPU instructions for better binaries' portability. * minor fix --- .github/script/amd64-18.04.Dockerfile | 2 +- .github/script/amd64-20.04.Dockerfile | 2 +- .github/script/amd64-22.04.Dockerfile | 2 +- .github/script/arm64-18.04.Dockerfile | 2 +- .github/script/arm64-20.04.Dockerfile | 2 +- .github/script/arm64-22.04.Dockerfile | 2 +- .github/workflows/docker-compile-ubuntu.yml | 4 ---- .github/workflows/ubuntu-18.04-compile.yml | 6 +++++- .github/workflows/ubuntu-compile.yml | 6 +++++- docker/Dockerfile | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/script/amd64-18.04.Dockerfile b/.github/script/amd64-18.04.Dockerfile index c46b4bcc..3e98b026 100644 --- a/.github/script/amd64-18.04.Dockerfile +++ b/.github/script/amd64-18.04.Dockerfile @@ -15,5 +15,5 @@ WORKDIR /ton/build ENV CC clang ENV CXX clang++ ENV CCACHE_DISABLE 1 -RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. +RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client \ No newline at end of file diff --git a/.github/script/amd64-20.04.Dockerfile b/.github/script/amd64-20.04.Dockerfile index ba78f1a2..ab71bbf2 100644 --- a/.github/script/amd64-20.04.Dockerfile +++ b/.github/script/amd64-20.04.Dockerfile @@ -15,5 +15,5 @@ WORKDIR /ton/build ENV CC clang ENV CXX clang++ ENV CCACHE_DISABLE 1 -RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. +RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client \ No newline at end of file diff --git a/.github/script/amd64-22.04.Dockerfile b/.github/script/amd64-22.04.Dockerfile index 16cfbfec..0479aa0b 100644 --- a/.github/script/amd64-22.04.Dockerfile +++ b/.github/script/amd64-22.04.Dockerfile @@ -15,5 +15,5 @@ WORKDIR /ton/build ENV CC clang ENV CXX clang++ ENV CCACHE_DISABLE 1 -RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. +RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client \ No newline at end of file diff --git a/.github/script/arm64-18.04.Dockerfile b/.github/script/arm64-18.04.Dockerfile index 5a0efc6f..d83fefe4 100644 --- a/.github/script/arm64-18.04.Dockerfile +++ b/.github/script/arm64-18.04.Dockerfile @@ -15,5 +15,5 @@ WORKDIR /ton/build ENV CC clang ENV CXX clang++ ENV CCACHE_DISABLE 1 -RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DTON_ARCH= .. +RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id dht-server lite-client \ No newline at end of file diff --git a/.github/script/arm64-20.04.Dockerfile b/.github/script/arm64-20.04.Dockerfile index f29a3fd0..ab5b8af2 100644 --- a/.github/script/arm64-20.04.Dockerfile +++ b/.github/script/arm64-20.04.Dockerfile @@ -15,5 +15,5 @@ WORKDIR /ton/build ENV CC clang ENV CXX clang++ ENV CCACHE_DISABLE 1 -RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DTON_ARCH= .. +RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id dht-server lite-client \ No newline at end of file diff --git a/.github/script/arm64-22.04.Dockerfile b/.github/script/arm64-22.04.Dockerfile index 73a3cff6..ac0999f6 100644 --- a/.github/script/arm64-22.04.Dockerfile +++ b/.github/script/arm64-22.04.Dockerfile @@ -15,5 +15,5 @@ WORKDIR /ton/build ENV CC clang ENV CXX clang++ ENV CCACHE_DISABLE 1 -RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DTON_ARCH= .. +RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id dht-server lite-client \ No newline at end of file diff --git a/.github/workflows/docker-compile-ubuntu.yml b/.github/workflows/docker-compile-ubuntu.yml index a69943be..08caab23 100644 --- a/.github/workflows/docker-compile-ubuntu.yml +++ b/.github/workflows/docker-compile-ubuntu.yml @@ -22,10 +22,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Show branch - run: | - echo branch ${GITHUB_REF##*/} - - name: Set output id: vars run: echo ::set-output name=short_ref::${GITHUB_REF#refs/*/} diff --git a/.github/workflows/ubuntu-18.04-compile.yml b/.github/workflows/ubuntu-18.04-compile.yml index a5637ce4..c661a683 100644 --- a/.github/workflows/ubuntu-18.04-compile.yml +++ b/.github/workflows/ubuntu-18.04-compile.yml @@ -18,6 +18,10 @@ jobs: sudo apt update sudo apt install -y build-essential git make cmake clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev ninja-build + - name: Show CPU flags + run: | + cat /proc/cpuinfo + - name: Configure & Build run: | export CC=$(which clang) @@ -25,7 +29,7 @@ jobs: export CCACHE_DISABLE=1 mkdir build cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state - name: Find & copy binaries diff --git a/.github/workflows/ubuntu-compile.yml b/.github/workflows/ubuntu-compile.yml index 18606380..a91e7128 100644 --- a/.github/workflows/ubuntu-compile.yml +++ b/.github/workflows/ubuntu-compile.yml @@ -21,6 +21,10 @@ jobs: sudo apt update sudo apt install -y build-essential git make cmake clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev ninja-build + - name: Show CPU flags + run: | + cat /proc/cpuinfo + - name: Configure & Build run: | export CC=$(which clang) @@ -28,7 +32,7 @@ jobs: export CCACHE_DISABLE=1 mkdir build-${{ matrix.os }} cd build-${{ matrix.os }} - cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork - name: Find & copy binaries diff --git a/docker/Dockerfile b/docker/Dockerfile index 71f09321..7536a492 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /ton RUN mkdir build && \ cd build && \ - cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. && \ + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" .. && \ ninja storage-daemon storage-daemon-cli tonlibjson fift func validator-engine validator-engine-console generate-random-id dht-server lite-client FROM ubuntu:20.04