Skip to content

Commit 71f73a7

Browse files
djramicdjramic
authored
Update jenkins docker to rocm7.0
Update jenkins docker to rocm7.0
2 parents 8288525 + c9f2b10 commit 71f73a7

File tree

5 files changed

+11
-27
lines changed

5 files changed

+11
-27
lines changed

‎mlir/utils/jenkins/Jenkinsfile‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,11 @@ void showEnv() {
282282

283283
String dockerImage() {
284284
// If this is being changed please change Dockerfile.migraphx-ci's base image as well
285-
return 'rocm/mlir:rocm6.4-latest'
285+
return 'rocm/mlir:rocm7.0-latest'
286286
}
287287

288288
String dockerImageCIMIGraphX() {
289-
return 'rocm/mlir-migraphx-ci:rocm6.4-latest'
289+
return 'rocm/mlir-migraphx-ci:rocm7.0-latest'
290290
}
291291

292292
void preMergeCheck(String codepath) {
@@ -347,7 +347,7 @@ void postProcessPerfRes(String chip) {
347347
alwaysLinkToLastBuild: false,
348348
keepAll: true,
349349
reportDir: 'build/reports',
350-
reportFiles: "${chip}_MLIR_Performance_Changes.html,${chip}_MLIR_vs_MIOpen.html,${chip}_MLIR_Performance_Changes_Gemm.html,${chip}_MLIR_vs_rocBLAS.html,${chip}_MLIR_vs_CK.html,${chip}_conv_fusion.html,${chip}_gemm_fusion.html",
350+
reportFiles: "${chip}_MLIR_Performance_Changes.html,${chip}_MLIR_vs_MIOpen.html,${chip}_MLIR_Performance_Changes_Gemm.html,${chip}_MLIR_vs_CK.html,${chip}_conv_fusion.html,${chip}_gemm_fusion.html",
351351
reportName: "Performance report for ${chip}"
352352
])
353353

@@ -358,14 +358,6 @@ void postProcessPerfRes(String chip) {
358358
yaxis: 'TFlops',\
359359
style: 'line',\
360360
group: 'Performance plots'
361-
}
362-
if (fileExists("build/${chip}_mlir_vs_rocblas_perf_for_plot.csv")) {
363-
plot csvFileName: "${chip}_plot-nightly-perf-results-gemm-000001.csv",\
364-
csvSeries: [[file: "build/${chip}_mlir_vs_rocblas_perf_for_plot.csv", displayTableFlag: false]],\
365-
title: "Test performance summary ${chip}, GEMM",\
366-
yaxis: 'TFlops',\
367-
style: 'line',\
368-
group: 'Performance plots'
369361
}
370362
// Save results for future comparison
371363
archiveArtifacts artifacts: 'build/*_mlir_*.csv,build/perf-run-date', allowEmptyArchive: true, onlyIfSuccessful: true
@@ -1248,10 +1240,9 @@ pipeline {
12481240
stage("Build MLIR") {
12491241
// Clean up build settings to disable static library and allow ROCm testing
12501242
buildProject(
1251-
'check-rocmlir-build-only ci-performance-scripts rocblas-benchmark-driver',
1243+
'check-rocmlir-build-only ci-performance-scripts',
12521244
'-DCMAKE_CXX_COMPILER=/opt/rocm/llvm/bin/clang++ ' +
1253-
'-DCMAKE_C_COMPILER=/opt/rocm/llvm/bin/clang ' +
1254-
'-DROCMLIR_ENABLE_BENCHMARKS=rocblas'
1245+
'-DCMAKE_C_COMPILER=/opt/rocm/llvm/bin/clang '
12551246
)
12561247
}
12571248

@@ -1264,7 +1255,7 @@ pipeline {
12641255
target: 'build/oldData'
12651256
}
12661257

1267-
stage("Test MLIR vs MIOpen/rocBLAS") {
1258+
stage("Test MLIR vs MIOpen") {
12681259
dir('build') {
12691260
def convInput = "${WORKSPACE}/mlir/utils/performance/configs/tier1-conv-configs"
12701261
def convToUse = "${WORKSPACE}/build/tier1-conv-configs"
@@ -1285,11 +1276,6 @@ pipeline {
12851276
--configs_file=${convToUse} \
12861277
--tuning_db=${WORKSPACE}/build/mlir_tuning_${CHIP}.tsv \
12871278
--quick_tuning_db=${WORKSPACE}/build/mlir_quick_tuning_${CHIP}.tsv"""
1288-
// Run MLIR vs rocBLAS perf benchmarks
1289-
sh """python3 ./bin/perfRunner.py --op=gemm --batch_all \
1290-
--configs_file=${gemmToUse} \
1291-
--tuning_db=${WORKSPACE}/build/mlir_tuning_${CHIP}.tsv \
1292-
--quick_tuning_db=${WORKSPACE}/build/mlir_quick_tuning_${CHIP}.tsv"""
12931279
}
12941280
}
12951281

@@ -1366,10 +1352,8 @@ pipeline {
13661352
dir('build') {
13671353
sh 'ls -l'
13681354
sh 'python3 ./bin/createPerformanceReports.py ${CHIP} MIOpen'
1369-
sh 'python3 ./bin/createPerformanceReports.py ${CHIP} rocBLAS'
13701355
sh 'python3 ./bin/createFusionPerformanceReports.py ${CHIP}'
13711356
sh 'python3 ./bin/perfRegressionReport.py ${CHIP}'
1372-
sh 'python3 ./bin/perfRegressionReport.py ${CHIP} ./oldData/${CHIP}_mlir_vs_rocblas_perf.csv ./${CHIP}_mlir_vs_rocblas_perf.csv'
13731357
sh 'mkdir -p reports && cp ./*.html reports'
13741358
}
13751359
postProcessPerfRes("${CHIP}")

‎mlir/utils/jenkins/Jenkinsfile.downstream‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Map<String,String> dockerArgs() {
5757
}
5858

5959
String dockerImage() {
60-
return 'rocm/mlir:rocm6.4-latest'
60+
return 'rocm/mlir:rocm7.0-latest'
6161
}
6262

6363

‎mlir/utils/jenkins/Jenkinsfile.release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ String dockerArgs() {
2727
}
2828

2929
String dockerImage() {
30-
return 'rocm/mlir:rocm6.4-latest'
30+
return 'rocm/mlir:rocm7.0-latest'
3131
}
3232

3333
pipeline {

‎mlir/utils/performance/perfRunner.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@ def run_config_with_mlir(config: PerfConfiguration,
16311631
'--entry-point-result=void'
16321632
]
16331633
profiler_cmd = [ROCPROF] + get_metric_args_for_rocprof(arch) + [
1634-
'--kernel-trace', '--stats', '-o', BENCHMARKING_RESULT_FILE_NAME, '--',
1634+
'--kernel-trace', '--stats', '-f', 'csv', '-o', BENCHMARKING_RESULT_FILE_NAME, '--',
16351635
paths.mlir_paths.cpu_runner_path
16361636
] + mlir_cpu_runner_args
16371637

@@ -1912,7 +1912,7 @@ def run_fusion_kernel(filename, rocmlir_gen_args, paths: Paths):
19121912
'--entry-point-result=void'
19131913
]
19141914
profiler_cmd = [ROCPROF] + get_metric_args_for_rocprof(chip) + [
1915-
'--kernel-trace', '--stats', '-o', BENCHMARKING_RESULT_FILE_NAME
1915+
'--kernel-trace', '--stats', '-f', 'csv', '-o', BENCHMARKING_RESULT_FILE_NAME
19161916
] + ['--', paths.mlir_paths.cpu_runner_path] + mlir_cpu_runner_args
19171917
commands.append(profiler_cmd)
19181918
outs, noerr = run_pipeline(commands)

‎mlir/utils/performance/tuningRunner.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def verify_kernel_with_perfconfig(perfconfig, config, paths: Paths, options: Opt
6666
]
6767
profiler_command = [perfRunner.ROCPROF] + perfRunner.get_metric_args_for_rocprof(
6868
options.arch) + [
69-
'--kernel-trace', '--stats', '-o', perfRunner.BENCHMARKING_RESULT_FILE_NAME, '--',
69+
'--kernel-trace', '--stats', '-f', 'csv', '-o', perfRunner.BENCHMARKING_RESULT_FILE_NAME, '--',
7070
paths.mlir_paths.cpu_runner_path
7171
] + mlir_cpu_runner_args
7272

0 commit comments

Comments
 (0)