Skip to content

Commit 965f853

Browse files
erwei-xilinxclaude
andcommitted
[multi-gpu] Phase 1: rename channel_type in cascade_chain_* tests
origin/main grew 5 new herd-placement tests via #1583 that use the pre-rename `channel_type = "cascade"`. After this PR's namespace rename ("cascade" -> "npu_cascade"), those tests fail under air-opt with the verifier rejecting the old name. Update them to "npu_cascade" so they keep passing on top of phase 1. Verified on rad-mi300a-sh5-1: AIRHerdPlacement 15/15 pass, Dialect/AIR 21/21 pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 45e543d commit 965f853

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

mlir/test/Transform/AIRHerdPlacement/cascade_chain_3herd.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
// CHECK: air.herd @consumer {{.*}} attributes {{{.*}}x_loc = 0 : i64, y_loc = 2 : i64}
1919

2020
module {
21-
air.channel @ab [8, 1] {channel_type = "cascade"}
22-
air.channel @bc [8, 1] {channel_type = "cascade"}
21+
air.channel @ab [8, 1] {channel_type = "npu_cascade"}
22+
air.channel @bc [8, 1] {channel_type = "npu_cascade"}
2323

2424
func.func @three_herd_cascade_chain() {
2525
%c1 = arith.constant 1 : index

mlir/test/Transform/AIRHerdPlacement/cascade_chain_3herd_ew.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
// CHECK: air.herd @consumer {{.*}} attributes {{{.*}}x_loc = 2 : i64, y_loc = 2 : i64}
1818

1919
module {
20-
air.channel @ab [1, 8] {channel_type = "cascade"}
21-
air.channel @bc [1, 8] {channel_type = "cascade"}
20+
air.channel @ab [1, 8] {channel_type = "npu_cascade"}
21+
air.channel @bc [1, 8] {channel_type = "npu_cascade"}
2222

2323
func.func @three_herd_cascade_chain_ew() {
2424
%c1 = arith.constant 1 : index

mlir/test/Transform/AIRHerdPlacement/cascade_chain_3herd_with_l1_upstream.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
module {
2424
air.channel @upstream_to_a [1, 1] {broadcast_shape = [8 : index, 1 : index]}
25-
air.channel @ab_q [8, 1] {channel_type = "cascade"}
26-
air.channel @bc_q [8, 1] {channel_type = "cascade"}
25+
air.channel @ab_q [8, 1] {channel_type = "npu_cascade"}
26+
air.channel @bc_q [8, 1] {channel_type = "npu_cascade"}
2727

2828
func.func @upstream_then_3_chain() {
2929
%c1 = arith.constant 1 : index

mlir/test/Transform/AIRHerdPlacement/cascade_chain_4herd.mlir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
// CHECK: air.herd @h3 {{.*}} attributes {{{.*}}x_loc = 0 : i64, y_loc = 0 : i64}
1919

2020
module {
21-
air.channel @c01 [8, 1] {channel_type = "cascade"}
22-
air.channel @c12 [8, 1] {channel_type = "cascade"}
23-
air.channel @c23 [8, 1] {channel_type = "cascade"}
21+
air.channel @c01 [8, 1] {channel_type = "npu_cascade"}
22+
air.channel @c12 [8, 1] {channel_type = "npu_cascade"}
23+
air.channel @c23 [8, 1] {channel_type = "npu_cascade"}
2424

2525
func.func @four_herd_cascade_chain() {
2626
%c1 = arith.constant 1 : index

mlir/test/Transform/AIRHerdPlacement/cascade_chain_multi_channel.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
// CHECK: air.herd @consumer {{.*}} attributes {{{.*}}x_loc = 0 : i64, y_loc = 2 : i64}
2020

2121
module {
22-
air.channel @ab_q [8, 1] {channel_type = "cascade"}
23-
air.channel @ab_k [8, 1] {channel_type = "cascade"}
24-
air.channel @ab_v [8, 1] {channel_type = "cascade"}
25-
air.channel @bc_q [8, 1] {channel_type = "cascade"}
26-
air.channel @bc_k [8, 1] {channel_type = "cascade"}
27-
air.channel @bc_v [8, 1] {channel_type = "cascade"}
22+
air.channel @ab_q [8, 1] {channel_type = "npu_cascade"}
23+
air.channel @ab_k [8, 1] {channel_type = "npu_cascade"}
24+
air.channel @ab_v [8, 1] {channel_type = "npu_cascade"}
25+
air.channel @bc_q [8, 1] {channel_type = "npu_cascade"}
26+
air.channel @bc_k [8, 1] {channel_type = "npu_cascade"}
27+
air.channel @bc_v [8, 1] {channel_type = "npu_cascade"}
2828

2929
func.func @three_herd_multi_channel() {
3030
%c1 = arith.constant 1 : index

0 commit comments

Comments
 (0)