Skip to content

Commit f0ed59e

Browse files
committed
Address review
1 parent 81aed1e commit f0ed59e

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

.github/workflows/spirv-ci-linux-amd-staging.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ jobs:
5252
- name: Configure LLVM
5353
run: |
5454
cmake -G Ninja -S llvm-project/llvm -B build \
55-
-DCMAKE_BUILD_TYPE=Release \
5655
-DLLVM_ENABLE_ASSERTIONS=ON \
5756
-DCMAKE_INSTALL_LIBDIR=lib \
5857
-DLLVM_ENABLE_PROJECTS="clang;lld" \
@@ -72,7 +71,6 @@ jobs:
7271
- name: Configure device-libs
7372
run: |
7473
cmake -G Ninja -S llvm-project/amd/device-libs -B build-device-libs \
75-
-DCMAKE_BUILD_TYPE=Release \
7674
-DCMAKE_PREFIX_PATH=$PWD/build \
7775
-DCMAKE_INSTALL_LIBDIR=lib \
7876
-DLLVM_DIR=$PWD/build/lib/cmake/llvm
@@ -87,7 +85,6 @@ jobs:
8785
# turns ON (otherwise translator-dependent lit tests are UNSUPPORTED).
8886
run: |
8987
cmake -G Ninja -S llvm-project/amd/comgr -B build-comgr \
90-
-DCMAKE_BUILD_TYPE=Release \
9188
-DCMAKE_INSTALL_LIBDIR=lib \
9289
-DCMAKE_PREFIX_PATH="$PWD/build;$PWD/build-device-libs" \
9390
-DLLVM_DIR=$PWD/build/lib/cmake/llvm \
@@ -127,7 +124,6 @@ jobs:
127124
- name: Configure ROCR-Runtime
128125
run: |
129126
cmake -G Ninja -S rocm-systems/projects/rocr-runtime -B build-rocr \
130-
-DCMAKE_BUILD_TYPE=Release \
131127
-DCMAKE_C_COMPILER=$PWD/build/bin/clang \
132128
-DCMAKE_CXX_COMPILER=$PWD/build/bin/clang++ \
133129
-DBUILD_SHARED_LIBS=ON \
@@ -144,7 +140,6 @@ jobs:
144140
- name: Configure CLR (HIP runtime)
145141
run: |
146142
cmake -G Ninja -S rocm-systems/projects/clr -B build-clr \
147-
-DCMAKE_BUILD_TYPE=Release \
148143
-DCMAKE_C_COMPILER=$PWD/build/bin/clang \
149144
-DCMAKE_CXX_COMPILER=$PWD/build/bin/clang++ \
150145
-DBUILD_SHARED_LIBS=ON \
@@ -587,13 +582,13 @@ jobs:
587582
-DCMAKE_HIP_FLAGS="--rocm-path=$STAGING" \
588583
-DCMAKE_HIP_LINK_FLAGS="-L$STAGING/lib -Wl,-rpath,$STAGING/lib" \
589584
-DCMAKE_EXE_LINKER_FLAGS="-L$STAGING/lib -Wl,-rpath,$STAGING/lib"
590-
cmake --build examples-build-hip-basic -j
585+
cmake --build examples-build-hip-basic -j $(nproc)
591586
592587
- name: ROCm Examples run HIP-Basic
593588
env:
594589
LD_LIBRARY_PATH: ${{ github.workspace }}/staging/lib
595590
run: |
596-
ctest --test-dir examples-build-hip-basic --output-on-failure -E '^hip_cooperative_groups$'
591+
ctest --test-dir examples-build-hip-basic --output-on-failure -j $(nproc) -E '^hip_cooperative_groups$'
597592
598593
# Applications.
599594
- name: ROCm Examples build Applications
@@ -609,13 +604,13 @@ jobs:
609604
-DCMAKE_HIP_FLAGS="--rocm-path=$STAGING" \
610605
-DCMAKE_HIP_LINK_FLAGS="-L$STAGING/lib -Wl,-rpath,$STAGING/lib" \
611606
-DCMAKE_EXE_LINKER_FLAGS="-L$STAGING/lib -Wl,-rpath,$STAGING/lib"
612-
cmake --build examples-build-Applications -j
607+
cmake --build examples-build-Applications -j $(nproc)
613608
614609
- name: ROCm Examples run Applications
615610
env:
616611
LD_LIBRARY_PATH: ${{ github.workspace }}/staging/lib
617612
run: |
618-
ctest --test-dir examples-build-Applications --output-on-failure -E '^(applications_optical_flow|applications_monte_carlo_pi)$'
613+
ctest --test-dir examples-build-Applications --output-on-failure -j $(nproc) -E '^(applications_optical_flow|applications_monte_carlo_pi)$'
619614
620615
# Libraries.
621616
- name: ROCm Examples build Libraries
@@ -631,7 +626,6 @@ jobs:
631626
-DHIP_PLATFORM=amd \
632627
-DROCM_PATH=$STAGING \
633628
-DCMAKE_HIP_ARCHITECTURES=amdgcnspirv \
634-
-DCMAKE_BUILD_TYPE=Release \
635629
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=TRUE \
636630
-DCMAKE_HIP_FLAGS="-DROCPRIM_DISABLE_DPP=1 --offload-new-driver --rocm-path=$STAGING -use-spirv-backend --rtlib=libgcc -unwindlib=libgcc" \
637631
-DCMAKE_HIP_LINK_FLAGS="--rtlib=libgcc -unwindlib=libgcc -L$STAGING/lib -Wl,-rpath,$STAGING/lib -Wl,--unresolved-symbols=ignore-in-shared-libs" \
@@ -644,4 +638,4 @@ jobs:
644638
env:
645639
LD_LIBRARY_PATH: ${{ github.workspace }}/staging/lib
646640
run: |
647-
ctest --test-dir examples-build-Libraries --output-on-failure -E '^(hiprand_simple_distributions_cpp|rocrand_simple_distributions_cpp)$'
641+
ctest --test-dir examples-build-Libraries --output-on-failure -j $(nproc) -E '^(hiprand_simple_distributions_cpp|rocrand_simple_distributions_cpp)$'

0 commit comments

Comments
 (0)