Skip to content

Commit 833ae1d

Browse files
illsilinillsilin
authored
Revert "Reduce build time tile engine (#2579)" (#2623)
This reverts commit e5b79b2.
1 parent 2203b0d commit 833ae1d

File tree

2 files changed

+253
-178
lines changed

2 files changed

+253
-178
lines changed

‎Jenkinsfile‎

Lines changed: 144 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,34 @@ def cmake_build(Map conf=[:]){
438438
echo "could not locate the requested artifacts: ${err.getMessage()}. will skip the stashing."
439439
}
440440
}
441+
if (params.RUN_CK_TILE_TRANSPOSE_TESTS){
442+
try{
443+
archiveArtifacts "perf_transpose_*.log"
444+
if (arch_type == 1){
445+
stash includes: "perf_transpose_**_gfx90a.log", name: "perf_transpose_log_gfx90a"
446+
}
447+
else if (arch_type == 2){
448+
stash includes: "perf_transpose_**_gfx942.log", name: "perf_transpose_log_gfx942"
449+
}
450+
}
451+
catch(Exception err){
452+
echo "could not locate the requested artifacts: ${err.getMessage()}. will skip the stashing."
453+
}
454+
}
455+
if (params.RUN_CK_TILE_GEMM_TESTS){
456+
try{
457+
archiveArtifacts "perf_tile_gemm_**.log"
458+
if (arch == 1){
459+
stash includes: "perf_tile_gemm_**_gfx90a.log", name: "perf_tile_gemm_log_gfx90a"
460+
}
461+
else if (arch == 2){
462+
stash includes: "perf_tile_gemm_**_gfx942.log", name: "perf_tile_gemm_log_gfx942"
463+
}
464+
}
465+
catch(Exception err){
466+
echo "could not locate the requested artifacts: ${err.getMessage()}. will skip the stashing."
467+
}
468+
}
441469
}
442470

443471
def buildHipClangJob(Map conf=[:]){
@@ -734,6 +762,24 @@ def process_results(Map conf=[:]){
734762
echo "could not locate the FMHA performance logs: ${err.getMessage()}."
735763
}
736764
}
765+
if (params.RUN_CK_TILE_TRANSPOSE_TESTS){
766+
try{
767+
unstash "perf_transpose_log_gfx942"
768+
unstash "perf_transpose_log_gfx90a"
769+
}
770+
catch(Exception err){
771+
echo "could not locate the Transpose performance logs: ${err.getMessage()}."
772+
}
773+
}
774+
if (params.RUN_CK_TILE_GEMM_TESTS){
775+
try{
776+
unstash "perf_tile_gemm_log_gfx942"
777+
unstash "perf_tile_gemm_log_gfx90a"
778+
}
779+
catch(Exception err){
780+
echo "could not locate the GEMM performance logs: ${err.getMessage()}."
781+
}
782+
}
737783
if (params.RUN_FULL_QA || params.BUILD_INSTANCES_ONLY){
738784
// unstash deb packages
739785
unstash "packages"
@@ -815,7 +861,7 @@ def run_aiter_tests(Map conf=[:]){
815861
}
816862

817863
//launch develop branch daily jobs
818-
CRON_SETTINGS = BRANCH_NAME == "develop" ? '''0 23 * * * % RUN_FULL_QA=true;DISABLE_DL_KERNELS=true;RUN_CK_TILE_FMHA_TESTS=true;RUN_TILE_ENGINE_GEMM_TESTS=true;RUN_PERFORMANCE_TESTS=true;RUN_ALL_UNIT_TESTS=true
864+
CRON_SETTINGS = BRANCH_NAME == "develop" ? '''0 23 * * * % RUN_FULL_QA=true;DISABLE_DL_KERNELS=true;RUN_CK_TILE_FMHA_TESTS=true;RUN_CK_TILE_TRANSPOSE_TESTS=true;RUN_CK_TILE_GEMM_TESTS=true;RUN_TILE_ENGINE_GEMM_TESTS=true;RUN_PERFORMANCE_TESTS=true;RUN_ALL_UNIT_TESTS=true
819865
0 21 * * * % RUN_GROUPED_CONV_LARGE_CASES_TESTS=true;hipTensor_test=true;BUILD_GFX908=true;BUILD_GFX942=true;BUILD_GFX950=true;RUN_PERFORMANCE_TESTS=true;RUN_ALL_UNIT_TESTS=true
820866
0 19 * * * % BUILD_DOCKER=true;COMPILER_VERSION=amd-staging;BUILD_COMPILER=/llvm-project/build/bin/clang++;USE_SCCACHE=false;NINJA_BUILD_TRACE=true;RUN_ALL_UNIT_TESTS=true
821867
0 17 * * * % BUILD_DOCKER=true;COMPILER_VERSION=amd-mainline;BUILD_COMPILER=/llvm-project/build/bin/clang++;USE_SCCACHE=false;NINJA_BUILD_TRACE=true;RUN_ALL_UNIT_TESTS=true
@@ -895,6 +941,14 @@ pipeline {
895941
name: "RUN_CK_TILE_FMHA_TESTS",
896942
defaultValue: false,
897943
description: "Run the ck_tile FMHA tests (default: OFF)")
944+
booleanParam(
945+
name: "RUN_CK_TILE_TRANSPOSE_TESTS",
946+
defaultValue: false,
947+
description: "Run the ck_tile Transpose tests (default: OFF)")
948+
booleanParam(
949+
name: "RUN_CK_TILE_GEMM_TESTS",
950+
defaultValue: false,
951+
description: "Run the ck_tile GEMM tests (default: OFF)")
898952
booleanParam(
899953
name: "RUN_TILE_ENGINE_GEMM_TESTS",
900954
defaultValue: false,
@@ -1144,6 +1198,94 @@ pipeline {
11441198
}
11451199
}
11461200
}
1201+
stage("Run CK_TILE_TRANSPOSE Tests")
1202+
{
1203+
parallel
1204+
{
1205+
stage("Run CK_TILE_TRANSPOSE Tests on gfx90a")
1206+
{
1207+
when {
1208+
beforeAgent true
1209+
expression { params.RUN_CK_TILE_TRANSPOSE_TESTS.toBoolean() }
1210+
}
1211+
agent{ label rocmnode("gfx90a") }
1212+
environment{
1213+
setup_args = "NO_CK_BUILD"
1214+
execute_args = """ ../script/cmake-ck-dev.sh ../ gfx90a && \
1215+
make -j64 tile_example_batched_transpose && \
1216+
cd ../ &&
1217+
example/ck_tile/35_batched_transpose/script/run_full_test.sh "CI_${params.COMPILER_VERSION}" "${env.BRANCH_NAME}" "${NODE_NAME}" gfx90a """
1218+
}
1219+
steps{
1220+
buildHipClangJobAndReboot(setup_args:setup_args, no_reboot:true, build_type: 'Release', execute_cmd: execute_args)
1221+
cleanWs()
1222+
}
1223+
}
1224+
stage("Run CK_TILE_TRANSPOSE Tests on gfx942")
1225+
{
1226+
when {
1227+
beforeAgent true
1228+
expression { params.RUN_CK_TILE_TRANSPOSE_TESTS.toBoolean() }
1229+
}
1230+
agent{ label rocmnode("gfx942") }
1231+
environment{
1232+
setup_args = "NO_CK_BUILD"
1233+
execute_args = """ ../script/cmake-ck-dev.sh ../ gfx942 && \
1234+
make -j64 tile_example_batched_transpose && \
1235+
cd ../ &&
1236+
example/ck_tile/35_batched_transpose/script/run_full_test.sh "CI_${params.COMPILER_VERSION}" "${env.BRANCH_NAME}" "${NODE_NAME}" gfx942 """
1237+
}
1238+
steps{
1239+
buildHipClangJobAndReboot(setup_args:setup_args, no_reboot:true, build_type: 'Release', execute_cmd: execute_args)
1240+
cleanWs()
1241+
}
1242+
}
1243+
}
1244+
}
1245+
stage("Run CK_TILE_GEMM Tests")
1246+
{
1247+
parallel
1248+
{
1249+
stage("Run CK_TILE_GEMM Tests on gfx90a")
1250+
{
1251+
when {
1252+
beforeAgent true
1253+
expression { params.RUN_CK_TILE_GEMM_TESTS.toBoolean() }
1254+
}
1255+
agent{ label rocmnode("gfx90a") }
1256+
environment{
1257+
setup_args = "NO_CK_BUILD"
1258+
execute_args = """ ../script/cmake-ck-dev.sh ../ gfx90a && \
1259+
make -j64 tile_example_gemm_universal && \
1260+
cd ../ &&
1261+
example/ck_tile/03_gemm/script/run_full_test.sh "CI_${params.COMPILER_VERSION}" "${env.BRANCH_NAME}" "${NODE_NAME}" gfx90a """
1262+
}
1263+
steps{
1264+
buildHipClangJobAndReboot(setup_args:setup_args, no_reboot:true, build_type: 'Release', execute_cmd: execute_args)
1265+
cleanWs()
1266+
}
1267+
}
1268+
stage("Run CK_TILE_GEMM Tests on gfx942")
1269+
{
1270+
when {
1271+
beforeAgent true
1272+
expression { params.RUN_CK_TILE_GEMM_TESTS.toBoolean() }
1273+
}
1274+
agent{ label rocmnode("gfx942") }
1275+
environment{
1276+
setup_args = "NO_CK_BUILD"
1277+
execute_args = """ ../script/cmake-ck-dev.sh ../ gfx942 && \
1278+
make -j64 tile_example_gemm_universal && \
1279+
cd ../ &&
1280+
example/ck_tile/03_gemm/script/run_full_test.sh "CI_${params.COMPILER_VERSION}" "${env.BRANCH_NAME}" "${NODE_NAME}" gfx942 """
1281+
}
1282+
steps{
1283+
buildHipClangJobAndReboot(setup_args:setup_args, no_reboot:true, build_type: 'Release', execute_cmd: execute_args)
1284+
cleanWs()
1285+
}
1286+
}
1287+
}
1288+
}
11471289
stage("Run TILE_ENGINE_GEMM Tests")
11481290
{
11491291
parallel
@@ -1350,7 +1492,7 @@ pipeline {
13501492
-DGPU_TARGETS="gfx90a" \
13511493
-DCMAKE_CXX_COMPILER="${build_compiler()}" \
13521494
-DCMAKE_C_COMPILER=/opt/rocm/llvm/bin/clang \
1353-
-DCMAKE_CXX_FLAGS=" -O3 " .. && make -j 32"""
1495+
-DCMAKE_CXX_FLAGS=" -O3 " .. && make -j """
13541496
}
13551497
steps{
13561498
Build_CK_and_Reboot(setup_args: setup_args, config_targets: "install", no_reboot:true, build_type: 'Release', execute_cmd: execute_args, prefixpath: '/usr/local')

0 commit comments

Comments
 (0)