Skip to content

Commit b8a3972

Browse files
committed
esp/ci: Run PIE optimization tests in separate job
1 parent 481f573 commit b8a3972

File tree

1 file changed

+39
-8
lines changed

1 file changed

+39
-8
lines changed

.gitlab-ci.yml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ build_and_test:
212212
stage: test_build
213213
artifacts:
214214
paths:
215+
- ${DIST_DIR}/
215216
- ${BUILD_DIR}/*.log
216-
- ./esp-dsp/scripts/
217217
when: always
218218
expire_in: 1 day
219219
retry: 1
220220
variables:
221-
TEST_APP_ESP_DSP_CUSTOM_BRANCH: "llvm-21-optimization-test-v2"
221+
PACK_TOOL: "tar cJhvf"
222222
before_script:
223223
- git config --global --add safe.directory $CI_PROJECT_DIR
224224
after_script:
@@ -259,12 +259,13 @@ build_and_test:
259259
- chmod o+w ${BUILD_PATH}/lld-tests.log;
260260
- runuser -u test_runner -- ninja -C ${BUILD_PATH} check-lld 2>&1 > ${BUILD_PATH}/lld-tests.log;
261261
- chown -R ${CUR_USER} ${BUILD_PATH};
262-
# TODO: Temporarily disable
263-
# - export PATH=${BUILD_PATH}/bin:${PATH}
264-
# - git clone --shallow-submodules --recursive --single-branch --branch $TEST_APP_ESP_DSP_CUSTOM_BRANCH -- https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/idf/esp-dsp.git esp-dsp
265-
# - pushd $PWD/esp-dsp/
266-
# - echo ${LLVM_PROJECT_PATH}/llvm/utils/update_test_checks.py
267-
# - ./test_all.sh ${LLVM_PROJECT_PATH}/llvm/utils/update_test_checks.py
262+
- mkdir -p ${PWD}/${DIST_DIR}
263+
- PIE_TEST_TOOLS_ARCH=${PWD}/${DIST_DIR}/pie_test_tools.tar.xz
264+
- pushd ${BUILD_PATH}
265+
- echo "Packing tools for PIE optimization tests"
266+
- ${PACK_TOOL} ${PIE_TEST_TOOLS_ARCH} bin/clang bin/llc bin/llvm-objdump bin/opt lib/clang
267+
- popd
268+
- ls -l ${PWD}/${DIST_DIR}
268269

269270
.build_linux-gnu_template:
270271
extends: .build_toolchain_template
@@ -476,6 +477,36 @@ sign_aarch64-apple-darwin:
476477
git clone --shallow-submodules --recursive --single-branch --branch $TEST_APP_ESP_DSP_CUSTOM_BRANCH -- https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/idf/esp-dsp.git esp-dsp
477478
pushd $PWD/esp-dsp/test_app
478479

480+
test_pie_optimizations:
481+
tags: [ "amd64", "build" ]
482+
stage: test
483+
needs:
484+
- job: "build_and_test"
485+
artifacts:
486+
paths:
487+
- esp-dsp/scripts/
488+
when: always
489+
expire_in: 1 day
490+
variables:
491+
TEST_APP_ESP_DSP_CUSTOM_BRANCH: "llvm-21-optimization-test-v2"
492+
UNPACK_TOOL: "tar xJvf"
493+
allow_failure: true
494+
script:
495+
- LLVM_PROJECT_PATH=$PWD
496+
- ls -l ${PWD}/${DIST_DIR}
497+
- PIE_TEST_TOOLS_ARCH=${PWD}/${DIST_DIR}/pie_test_tools.tar.xz
498+
- echo "Unpacking tools for PIE optimization tests"
499+
- mkdir pie_tests
500+
- pushd pie_tests
501+
- ${UNPACK_TOOL} ${PIE_TEST_TOOLS_ARCH}
502+
- ls -l $PWD
503+
- export PATH=${PWD}/bin:${PATH}
504+
- popd
505+
- git clone --shallow-submodules --recursive --single-branch --branch $TEST_APP_ESP_DSP_CUSTOM_BRANCH -- https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/idf/esp-dsp.git esp-dsp
506+
- pushd $PWD/esp-dsp/
507+
- echo ${LLVM_PROJECT_PATH}/llvm/utils/update_test_checks.py
508+
- ./test_all.sh ${LLVM_PROJECT_PATH}/llvm/utils/update_test_checks.py
509+
479510
test_esp_dsp:
480511
stage: test
481512
image: espressif/idf:latest

0 commit comments

Comments
 (0)