Skip to content

Commit 6f37f5b

Browse files
committed
[RISCV] Move clang-riscv-rva20-2stage to cross-build and then test under qemu-system
1 parent ec9391e commit 6f37f5b

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3151,7 +3151,9 @@
31513151
'CXX': 'clang++',
31523152
})},
31533153

3154-
## RISC-V RVA20 profile check-all 2-stage
3154+
## RISC-V RVA20 profile check-all 2-stage. The second stage is
3155+
# cross-compiled on the x86 host and then lit runs under a qemu-system image
3156+
# using the just-build artifacts.
31553157
{'name' : "clang-riscv-rva20-2stage",
31563158
'tags' : ["clang"],
31573159
'workernames' : ["rise-clang-riscv-rva20-2stage"],
@@ -3161,6 +3163,7 @@
31613163
useTwoStage=True,
31623164
runTestSuite=False,
31633165
testStage1=False,
3166+
checkout_compiler_rt=False,
31643167
extra_cmake_args=[
31653168
"-DCMAKE_C_COMPILER=clang",
31663169
"-DCMAKE_CXX_COMPILER=clang++",
@@ -3169,9 +3172,23 @@
31693172
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
31703173
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"],
31713174
extra_stage2_cmake_args=[
3172-
"-DLLVM_ENABLE_LLD=True",
3173-
"-DCMAKE_C_FLAGS='-march=rva20u64'",
3174-
"-DCMAKE_CXX_FLAGS='-march=rva20u64'"]
3175+
util.Interpolate(f"-DLLVM_NATIVE_TOOL_DIR=%(prop:builddir)s/stage1.install/bin"),
3176+
"-DLLVM_BUILD_TESTS=True",
3177+
"-DLLVM_EXTERNAL_LIT=/home/buildbot-worker/lit-on-qemu-system-rva20.py",
3178+
],
3179+
stage2_toolchain_options=[
3180+
"set(CMAKE_SYSTEM_NAME Linux)",
3181+
"set(CMAKE_SYSROOT /home/buildbot-worker/rvsysroot)",
3182+
"set(CMAKE_C_COMPILER_TARGET riscv64-linux-gnu)",
3183+
"set(CMAKE_CXX_COMPILER_TARGET riscv64-linux-gnu)",
3184+
"set(CMAKE_C_FLAGS_INIT '-march=rva20u64')",
3185+
"set(CMAKE_CXX_FLAGS_INIT '-march=rva20u64')",
3186+
"set(CMAKE_LINKER_TYPE LLD)",
3187+
"set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)",
3188+
"set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)",
3189+
"set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)",
3190+
"set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)",
3191+
]
31753192
)},
31763193

31773194
## RISC-V RVA23 profile check-all 2-stage

0 commit comments

Comments
 (0)