Skip to content

Commit f09a39f

Browse files
bogdan-petkovicbogdan-petkovic
committed
standardize Jenkins CODEPATH gfx bucket names
Signed-off-by: bogdan-petkovic <bogdan.petkovic@htecgroup.com>
1 parent 78e7aaa commit f09a39f

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

‎mlir/utils/jenkins/Jenkinsfile‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -655,19 +655,19 @@ String getLabelFromCodepath(String codepath) {
655655
} else {
656656
label = 'mlir && linux-mi350-1'
657657
}
658-
} else if (codepath == "navi21") {
658+
} else if (codepath == "gfx10x") {
659659
// For non-performance related testing, use both workstations (gfx1030w)
660660
// and server nodes (gfx1030)
661661
label = 'mlir && ( gfx1030w || gfx1030 )'
662662
} else if (codepath == "vanilla"){
663663
label = 'mlir'
664-
} else if (codepath == "navi3x") {
664+
} else if (codepath == "gfx11x") {
665665
if (params.nightly || params.weekly) {
666666
label = 'mlir && gfx1100'
667667
} else {
668668
label = 'mlir && ( gfx1100 || gfx1101 )'
669669
}
670-
} else if (codepath == "navi4x") {
670+
} else if (codepath == "gfx12x") {
671671
if (params.nightly || params.weekly) {
672672
label = 'mlir && gfx1201'
673673
} else {
@@ -759,7 +759,7 @@ void parameterSweep(String CONFIG, String sweepType = "default") {
759759
String attnCodepath = "auto"
760760
if (CONFIG == "mfma" || CONFIG == "gfx950") {
761761
attnCodepath = "mfma"
762-
} else if (CONFIG == "navi21" || CONFIG == "navi3x" || CONFIG == "navi4x") {
762+
} else if (CONFIG == "gfx10x" || CONFIG == "gfx11x" || CONFIG == "gfx12x") {
763763
attnCodepath = "wmma"
764764
}
765765
sh """python3 ./bin/attentionSweeps.py -j ${limit_lit_workers} --codepath ${attnCodepath} --log-failures --debug-fails"""
@@ -782,17 +782,17 @@ boolean shouldRunFromCodepath(String codepath) {
782782
if (codepath == "gfx950" && params.canXdlops && params.disable950 == false) {
783783
return true
784784
}
785-
// Run navi21 on private nightly or weekly CI if it is not disabled
786-
if (params.canXdlops && (params.disableNavi21 == false) && (codepath == "navi21") &&
785+
// Run gfx10x on private nightly or weekly CI if it is not disabled
786+
if (params.canXdlops && (params.disableGfx10x == false) && (codepath == "gfx10x") &&
787787
(params.nightly || params.weekly)) {
788788
return true
789789
}
790-
// Run navi3x on private CI if it is not disabled
791-
if (params.canXdlops && (params.disableNavi3x == false) && (codepath == "navi3x")) {
790+
// Run gfx11x on private CI if it is not disabled
791+
if (params.canXdlops && (params.disableGfx11x == false) && (codepath == "gfx11x")) {
792792
return true
793793
}
794-
// Run navi4x on private CI if it is not disabled
795-
if (params.canXdlops && (params.disableNavi4x == false) && (codepath == "navi4x")) {
794+
// Run gfx12x on private CI if it is not disabled
795+
if (params.canXdlops && (params.disableGfx12x == false) && (codepath == "gfx12x")) {
796796
return true;
797797
}
798798
return false
@@ -813,12 +813,12 @@ boolean shouldRunFromChip(String chip) {
813813
case "gfx950":
814814
return params.disable950 == false && shouldRunFromCodepath("gfx950")
815815
case "gfx1030":
816-
return shouldRunFromCodepath("navi21")
816+
return shouldRunFromCodepath("gfx10x")
817817
case "gfx1100":
818-
return shouldRunFromCodepath("navi3x")
818+
return shouldRunFromCodepath("gfx11x")
819819
case "gfx1200":
820820
case "gfx1201":
821-
return shouldRunFromCodepath("navi4x")
821+
return shouldRunFromCodepath("gfx12x")
822822
}
823823
}
824824

@@ -840,7 +840,7 @@ void archivePerfDB() {
840840
}
841841

842842
boolean shouldRunBuildAndTest(String codepath) {
843-
// When default codepath is selected, we test mfma, navi21, navi3x and navi4x on
843+
// When default codepath is selected, we test mfma, gfx10x, gfx11x and gfx12x on
844844
// private CI and vanilla on public CI
845845
if (params.codepath == "default" && shouldRunFromCodepath(codepath))
846846
return true
@@ -851,14 +851,14 @@ boolean shouldRunBuildAndTest(String codepath) {
851851
if (params.codepath == "mfma") return true
852852
if (params.codepath == "vanilla") return true
853853
if (params.codepath == "gfx950" && params.disable950 == false) return true
854-
if (params.codepath == "navi21" && params.disableNavi21 == false) return true
855-
if (params.codepath == "navi3x" && params.disableNavi3x == false) return true
856-
if (params.codepath == "navi4x" && params.disableNavi4x == false) return true
854+
if (params.codepath == "gfx10x" && params.disableGfx10x == false) return true
855+
if (params.codepath == "gfx11x" && params.disableGfx11x == false) return true
856+
if (params.codepath == "gfx12x" && params.disableGfx12x == false) return true
857857
return false
858858
}
859859
}
860860

861-
boolean isNotNavi3x(String chip) {
861+
boolean isNotGfx11x(String chip) {
862862
return "${chip}" != 'gfx1100' && "${chip}" != 'gfx1101'
863863
}
864864

@@ -994,17 +994,17 @@ pipeline {
994994

995995
// choose the codepath for testing
996996
choice(name: 'codepath',
997-
choices: ['default', 'mfma', 'navi21', 'navi3x', 'navi4x', 'vanilla', 'gfx950'],
997+
choices: ['default', 'mfma', 'gfx10x', 'gfx11x', 'gfx12x', 'vanilla', 'gfx950'],
998998
description: 'Choose the codepath to test')
999-
// option to disable navi21 cells in case nodes are offline
1000-
booleanParam(name: 'disableNavi21', defaultValue: true,
1001-
description: 'Disable testing on Navi21')
1002-
// option to disable navi3x cells in case nodes are offline
1003-
booleanParam(name: 'disableNavi3x', defaultValue: false,
1004-
description: 'Disable testing on Navi3x')
1005-
// option to disable navi4x cells in case nodes are offline
1006-
booleanParam(name: 'disableNavi4x', defaultValue: false,
1007-
description: 'Disable testing on Navi4x')
999+
// option to disable gfx10x cells in case nodes are offline
1000+
booleanParam(name: 'disableGfx10x', defaultValue: true,
1001+
description: 'Disable testing on gfx10x')
1002+
// option to disable gfx11x cells in case nodes are offline
1003+
booleanParam(name: 'disableGfx11x', defaultValue: false,
1004+
description: 'Disable testing on gfx11x')
1005+
// option to disable gfx12x cells in case nodes are offline
1006+
booleanParam(name: 'disableGfx12x', defaultValue: false,
1007+
description: 'Disable testing on gfx12x')
10081008
booleanParam(name: 'disable90a', defaultValue: false,
10091009
description: 'Disable testing on gfx90a')
10101010
booleanParam(name: 'disable908', defaultValue: false,
@@ -1048,7 +1048,7 @@ pipeline {
10481048
axes {
10491049
axis {
10501050
name 'CODEPATH'
1051-
values 'vanilla', 'mfma', 'navi21', 'gfx950'
1051+
values 'vanilla', 'mfma', 'gfx10x', 'gfx950'
10521052
}
10531053
}
10541054
// One big scripted step per matrix row
@@ -1191,7 +1191,7 @@ pipeline {
11911191
axes {
11921192
axis {
11931193
name 'CODEPATH'
1194-
values 'mfma', 'vanilla', 'navi21', 'navi3x', 'navi4x', 'gfx950'
1194+
values 'mfma', 'vanilla', 'gfx10x', 'gfx11x', 'gfx12x', 'gfx950'
11951195
}
11961196
}
11971197
// One big scripted step per matrix row
@@ -1602,7 +1602,7 @@ PY
16021602
}
16031603
}
16041604

1605-
if (isNotNavi3x(CHIP)) {
1605+
if (isNotGfx11x(CHIP)) {
16061606
stage("Test Attention") {
16071607
dir('build') {
16081608
def attnInput = "${WORKSPACE}/mlir/utils/performance/configs/tier1-attention-configs"
@@ -1621,7 +1621,7 @@ PY
16211621
}
16221622
}
16231623

1624-
if (params.checkCK && isNotNavi3x(CHIP)) {
1624+
if (params.checkCK && isNotGfx11x(CHIP)) {
16251625
stage("Test MLIR vs CK") {
16261626
catchError (buildResult: null) { // This is an optional stage
16271627
dir('composable_kernel') {
@@ -1707,7 +1707,7 @@ PY
17071707
axes {
17081708
axis {
17091709
name 'CODEPATH'
1710-
values 'mfma', 'navi21', 'navi4x', 'gfx950'
1710+
values 'mfma', 'gfx10x', 'gfx12x', 'gfx950'
17111711
}
17121712
}
17131713
// One big scripted step per matrix row
@@ -1778,7 +1778,7 @@ PY
17781778
// does not quantize attention ops leaving them in f32. Exclude
17791779
// attention from MLIR ops on RDNA for int8
17801780
def mlirOps = 'convolution,fused,dot,attention'
1781-
def mlirOpsInt8 = (CODEPATH == 'navi21' || CODEPATH == 'navi4x')
1781+
def mlirOpsInt8 = (CODEPATH == 'gfx10x' || CODEPATH == 'gfx12x')
17821782
? 'convolution,fused,dot'
17831783
: 'convolution,fused,dot,attention'
17841784

@@ -1838,7 +1838,7 @@ PY
18381838
axes {
18391839
axis {
18401840
name 'CODEPATH'
1841-
values 'mfma', 'navi4x', 'gfx950'
1841+
values 'mfma', 'gfx12x', 'gfx950'
18421842
}
18431843
}
18441844
// One big scripted step per matrix row

0 commit comments

Comments
 (0)
⚡