Skip to content

Commit

Permalink
more updates
Browse files Browse the repository at this point in the history
  • Loading branch information
antonbaliasnikov committed Jan 31, 2025
1 parent c136f15 commit b244fb2
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions .github/workflows/lnt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ on:
description: 'Github Actions cache key for CCache.'
required: false
default: ''
ccache-key-type:
type: string
required: false
default: 'dynamic'
description: 'Type of ccache key: `static` - rotate each month, or `dynamic` - rotate with each update of `LLVM.lock`.'
compiler-tester-repo:
type: string
required: false
Expand All @@ -44,6 +39,9 @@ jobs:
options: -m 110g
env:
RESULTS_DIR: results
LNT_SERVER_URL: http://llvm-lnt.infra.matterlabs.corp
LNT_TEST_SUITE: zksync

steps:

- name: Checkout LNT
Expand All @@ -52,10 +50,10 @@ jobs:
repository: llvm/llvm-lnt
path: lnt

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.9'
# - name: Setup Python
# uses: actions/setup-python@v5
# with:
# python-version: '3.9'

- name: Install LNT
run: cd lnt && pip install .
Expand Down Expand Up @@ -89,22 +87,22 @@ jobs:
- name: Build LLVM
uses: matter-labs/era-compiler-ci/.github/actions/build-llvm@main
with:
build-type: Release
clone-llvm: ${{ steps.define-branches.outputs.llvm-branch == '' && 'true' || 'false' }}
enable-assertions: true
ccache-key-type: ${{ inputs.ccache-key-type }}
enable-assertions: false
ccache-key: ${{ inputs.ccache-key }}

- name: Build compiler-tester
run: cargo build --verbose --release --bin 'compiler-tester'
run: cargo build --release --bin 'compiler-tester'

- name: Build compilers
env:
CARGO_CHECKOUT_DIR: /usr/local/cargo/git/checkouts
run: |
cargo build --verbose --release \
cargo build --release \
--manifest-path ${CARGO_CHECKOUT_DIR}/era-compiler-solidity-*/*/Cargo.toml \
--target-dir './target-zksolc/'
cargo build --verbose --release \
cargo build --release \
--manifest-path ${CARGO_CHECKOUT_DIR}/era-compiler-vyper-*/*/Cargo.toml \
--target-dir './target-zkvyper/'
Expand All @@ -128,8 +126,8 @@ jobs:
# Run benchmarks
./target/release/compiler-tester \
--zksolc ./target-zksolc/release/zksolc \
--zkvyper ./target-zkvyper/release/zkvyper \
--target eravm \
--path 'solidity' \
--mode "${MODE}" \
--toolchain "${TOOLCHAIN}" \
--benchmark "${RESULTS_DIR}" \
Expand All @@ -153,8 +151,8 @@ jobs:
# Run benchmarks
./target/release/compiler-tester \
--zksolc ./target-zksolc/release/zksolc \
--zkvyper ./target-zkvyper/release/zkvyper \
--target evm \
--path 'solidity' \
--mode "${MODE}" \
--toolchain "${TOOLCHAIN}" \
--environment "${ENV}" \
Expand All @@ -170,7 +168,7 @@ jobs:
shell: bash -ex {0}
run: |
for JSON in $(ls ${RESULTS_DIR}/*.json); do
lnt submit --ignore-regressions \
http://llvm-lnt.infra.matterlabs.corp/db_default/v4/zksync/submitRun \
lnt submit --ignore-regressions --select-machine=update \
${LNT_SERVER_URL}/db_default/v4/${LNT_TEST_SUITE}/submitRun \
"${JSON}"
done

0 comments on commit b244fb2

Please sign in to comment.