@@ -58,27 +58,27 @@ func.func @vector_load_i4_dynamic(%arg0 : index, %arg1 : index, %arg2 : index, %
5858 %1 = vector.load %0 [%arg2 , %arg3 ] : memref <?x?xi4 >, vector <8 xi4 >
5959 return %1 : vector <8 xi4 >
6060}
61- // CHECK-DAG: #[[MAP0:.+]] = affine_map<()[s0, s1, s2 ] -> ((s0 * s1) floordiv 2, s2 floordiv 2)>
61+ // CHECK-DAG: #[[MAP0:.+]] = affine_map<()[s0, s1] -> ((s0 * s1) floordiv 2, s0 floordiv 2)>
6262// CHECK-DAG: #[[MAP1:.+]] = affine_map<()[s0, s1, s2] -> ((s2 + s0 * s1) floordiv 2)>
6363// CHECK: func.func @vector_load_i4_dynamic(
6464// CHECK-SAME: %[[ARG0:[a-zA-Z0-9_]+]]: index
6565// CHECK-SAME: %[[ARG1:[a-zA-Z0-9_]+]]: index
6666// CHECK-SAME: %[[ARG2:[a-zA-Z0-9_]+]]: index
6767// CHECK-SAME: %[[ARG3:[a-zA-Z0-9_]+]]: index
68- // CHECK: %[[SIZE:.+]] = affine.max #[[MAP0]]()[%[[ARG1]], %[[ARG0]], %[[ARG1]] ]
68+ // CHECK: %[[SIZE:.+]] = affine.max #[[MAP0]]()[%[[ARG1]], %[[ARG0]]]
6969// CHECK: %[[ALLOC:.+]] = memref.alloc(%[[SIZE]]) : memref<?xi8>
7070// CHECK: %[[INDEX:.+]] = affine.apply #[[MAP1]]()[%[[ARG2]], %[[ARG1]], %[[ARG3]]]
7171// CHECK: %[[VEC:.+]] = vector.load %[[ALLOC]][%[[INDEX]]] : memref<?xi8>, vector<4xi8>
7272// CHECK: %[[VEC_I4:.+]] = vector.bitcast %[[VEC]] : vector<4xi8> to vector<8xi4>
7373
74- // CHECK32-DAG: #[[MAP0:.+]] = affine_map<()[s0, s1, s2 ] -> ((s0 * s1) floordiv 8, s2 floordiv 8)>
74+ // CHECK32-DAG: #[[MAP0:.+]] = affine_map<()[s0, s1] -> ((s0 * s1) floordiv 8, s0 floordiv 8)>
7575// CHECK32-DAG: #[[MAP1:.+]] = affine_map<()[s0, s1, s2] -> ((s2 + s0 * s1) floordiv 8)>
7676// CHECK32: func.func @vector_load_i4_dynamic(
7777// CHECK32-SAME: %[[ARG0:[a-zA-Z0-9_]+]]: index
7878// CHECK32-SAME: %[[ARG1:[a-zA-Z0-9_]+]]: index
7979// CHECK32-SAME: %[[ARG2:[a-zA-Z0-9_]+]]: index
8080// CHECK32-SAME: %[[ARG3:[a-zA-Z0-9_]+]]: index
81- // CHECK32: %[[SIZE:.+]] = affine.max #[[MAP0]]()[%[[ARG1]], %[[ARG0]], %[[ARG1]] ]
81+ // CHECK32: %[[SIZE:.+]] = affine.max #[[MAP0]]()[%[[ARG1]], %[[ARG0]]]
8282// CHECK32: %[[ALLOC:.+]] = memref.alloc(%[[SIZE]]) : memref<?xi32>
8383// CHECK32: %[[INDEX:.+]] = affine.apply #[[MAP1]]()[%[[ARG2]], %[[ARG1]], %[[ARG3]]]
8484// CHECK32: %[[VEC:.+]] = vector.load %[[ALLOC]][%[[INDEX]]] : memref<?xi32>, vector<1xi32>
@@ -450,29 +450,29 @@ func.func @vector_store_i4_dynamic(%arg0: vector<8xi4>, %arg1: index, %arg2: ind
450450 return
451451}
452452
453- // CHECK-DAG: #[[MAP:.+]] = affine_map<()[s0, s1, s2 ] -> ((s0 * s1) floordiv 2, s2 floordiv 2)>
453+ // CHECK-DAG: #[[MAP:.+]] = affine_map<()[s0, s1] -> ((s0 * s1) floordiv 2, s0 floordiv 2)>
454454// CHECK-DAG: #[[MAP1:.+]] = affine_map<()[s0, s1, s2] -> ((s2 + s0 * s1) floordiv 2)>
455455// CHECK: func @vector_store_i4_dynamic
456456// CHECK-SAME: %[[ARG0:[a-zA-Z0-9]+]]: vector<8xi4>
457457// CHECK-SAME: %[[ARG1:[a-zA-Z0-9]+]]: index
458458// CHECK-SAME: %[[ARG2:[a-zA-Z0-9]+]]: index
459459// CHECK-SAME: %[[ARG3:[a-zA-Z0-9]+]]: index
460460// CHECK-SAME: %[[ARG4:[a-zA-Z0-9]+]]: index
461- // CHECK: %[[SIZE:.+]] = affine.max #[[MAP]]()[%[[ARG2]], %[[ARG1]], %[[ARG2]] ]
461+ // CHECK: %[[SIZE:.+]] = affine.max #[[MAP]]()[%[[ARG2]], %[[ARG1]]]
462462// CHECK: %[[ALLOC:.+]] = memref.alloc(%[[SIZE]]) : memref<?xi8>
463463// CHECK: %[[INDEX:.+]] = affine.apply #[[MAP1]]()[%[[ARG3]], %[[ARG2]], %[[ARG4]]]
464464// CHECK: %[[VEC_I8:.+]] = vector.bitcast %[[ARG0]] : vector<8xi4> to vector<4xi8>
465465// CHECK: vector.store %[[VEC_I8:.+]], %[[ALLOC:.+]][%[[INDEX:.+]]] : memref<?xi8>, vector<4xi8>
466466
467- // CHECK32-DAG: #[[MAP:.+]] = affine_map<()[s0, s1, s2 ] -> ((s0 * s1) floordiv 8, s2 floordiv 8)>
467+ // CHECK32-DAG: #[[MAP:.+]] = affine_map<()[s0, s1] -> ((s0 * s1) floordiv 8, s0 floordiv 8)>
468468// CHECK32-DAG: #[[MAP1:.+]] = affine_map<()[s0, s1, s2] -> ((s2 + s0 * s1) floordiv 8)>
469469// CHECK32: func @vector_store_i4_dynamic
470470// CHECK32-SAME: %[[ARG0:[a-zA-Z0-9]+]]: vector<8xi4>
471471// CHECK32-SAME: %[[ARG1:[a-zA-Z0-9]+]]: index
472472// CHECK32-SAME: %[[ARG2:[a-zA-Z0-9]+]]: index
473473// CHECK32-SAME: %[[ARG3:[a-zA-Z0-9]+]]: index
474474// CHECK32-SAME: %[[ARG4:[a-zA-Z0-9]+]]: index
475- // CHECK32: %[[SIZE:.+]] = affine.max #[[MAP]]()[%[[ARG2]], %[[ARG1]], %[[ARG2]] ]
475+ // CHECK32: %[[SIZE:.+]] = affine.max #[[MAP]]()[%[[ARG2]], %[[ARG1]]]
476476// CHECK32: %[[ALLOC:.+]] = memref.alloc(%[[SIZE]]) : memref<?xi32>
477477// CHECK32: %[[INDEX:.+]] = affine.apply #[[MAP1]]()[%[[ARG3]], %[[ARG2]], %[[ARG4]]]
478478// CHECK32: %[[VEC_I8:.+]] = vector.bitcast %[[ARG0]] : vector<8xi4> to vector<1xi32>
@@ -537,7 +537,7 @@ func.func @vector_maskedstore_i4(
537537// CHECK: #[[$ATTR_10:.+]] = affine_map<()[s0, s1] -> (s0 * 4 + s1 floordiv 2)>
538538// CHECK: #[[$ATTR_11:.+]] = affine_map<()[s0] -> (s0 ceildiv 2)>
539539
540- // CHECK-LABEL: func.func @vector_maskedstore_i4(
540+ // CHECK: func.func @vector_maskedstore_i4(
541541// CHECK-SAME: %[[IDX_1:[a-zA-Z0-9]+]]: index,
542542// CHECK-SAME: %[[IDX_2:[a-zA-Z0-9]+]]: index,
543543// CHECK-SAME: %[[NUM_EL_TO_STORE:[a-zA-Z0-9]+]]: index,
@@ -557,7 +557,7 @@ func.func @vector_maskedstore_i4(
557557// CHECK32: #[[$ATTR_17:.+]] = affine_map<()[s0, s1] -> (s0 + s1 floordiv 8)>
558558// CHECK32: #[[$ATTR_18:.+]] = affine_map<()[s0] -> (s0 ceildiv 8)>
559559
560- // CHECK32-LABEL: func.func @vector_maskedstore_i4(
560+ // CHECK32: func.func @vector_maskedstore_i4(
561561// CHECK32-SAME: %[[IDX_1:[a-zA-Z0-9]+]]: index,
562562// CHECK32-SAME: %[[IDX_2:[a-zA-Z0-9]+]]: index,
563563// CHECK32-SAME: %[[NUM_EL_TO_STORE:[a-zA-Z0-9]+]]: index,
@@ -623,7 +623,7 @@ func.func @vector_maskedstore_i4_constant_mask(
623623}
624624
625625// CHECK: #[[$ATTR_12:.+]] = affine_map<()[s0, s1] -> (s0 * 4 + s1 floordiv 2)>
626- // CHECK-LABEL: func.func @vector_maskedstore_i4_constant_mask(
626+ // CHECK: func.func @vector_maskedstore_i4_constant_mask(
627627// CHECK-SAME: %[[IDX_1:[a-zA-Z0-9]+]]: index,
628628// CHECK-SAME: %[[IDX_2:[a-zA-Z0-9]+]]: index,
629629// CHECK-SAME: %[[VAL_TO_STORE:[a-zA-Z0-9]+]]: vector<8xi4>) {
@@ -639,7 +639,7 @@ func.func @vector_maskedstore_i4_constant_mask(
639639// CHECK: vector.maskedstore %[[ALLOC]]{{\[}}%[[LIDX]]], %[[NEW_MASK]], %[[NEW_VAL]] : memref<12xi8>, vector<4xi1>, vector<4xi8>
640640
641641// CHECK32: #[[$ATTR_20:.+]] = affine_map<()[s0, s1] -> (s0 + s1 floordiv 8)>
642- // CHECK32-LABEL: func.func @vector_maskedstore_i4_constant_mask(
642+ // CHECK32: func.func @vector_maskedstore_i4_constant_mask(
643643// CHECK32-SAME: %[[IDX_1:[a-zA-Z0-9]+]]: index,
644644// CHECK32-SAME: %[[IDX_2:[a-zA-Z0-9]+]]: index,
645645// CHECK32-SAME: %[[VAL_TO_STORE:[a-zA-Z0-9]+]]: vector<8xi4>) {
0 commit comments