Modify the syntax of the the ElementsAttrs to print the type as a colon type.

This is the standard syntax for types on operations, and is also already used by IntegerAttr and FloatAttr.

Example:
  dense<5> : tensor<i32>
  dense<[3]> : tensor<1xi32>
PiperOrigin-RevId: 255069157

8 files changed, 36 insertions, 36 deletions

diff --git a/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir b/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir
index 34697282c87..e648e51f3d5 100644
--- a/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir
+++ b/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir
@@ -126,7 +126,7 @@ func @materialize_read(%M: index, %N: index, %O: index, %P: index) {
 
 // CHECK-LABEL:func @materialize_write(%arg0: index, %arg1: index, %arg2: index, %arg3: index) {
 func @materialize_write(%M: index, %N: index, %O: index, %P: index) {
-  // CHECK-NEXT:  %cst = constant dense<vector<5x4x3xf32>, 1.000000e+00>
+  // CHECK-NEXT:  %cst = constant dense<1.000000e+00> : vector<5x4x3xf32>
   // CHECK-NEXT:  %[[C0:.*]] = constant 0 : index
   // CHECK-NEXT:  %0 = alloc(%arg0, %arg1, %arg2, %arg3) : memref<?x?x?x?xf32>
   // CHECK-NEXT:  affine.for %[[I0:.*]] = 0 to %arg0 step 3 {
@@ -188,7 +188,7 @@ func @materialize_write(%M: index, %N: index, %O: index, %P: index) {
   // Check that I3 + I6 (of size 5) read from first index load(I6, ...) and write into last index store(..., S3)
   // Other dimension is just accessed with I2.
   %A = alloc (%M, %N, %O, %P) : memref<?x?x?x?xf32, 0>
-  %f1 = constant dense<vector<5x4x3xf32>, 1.000000e+00>
+  %f1 = constant dense<1.000000e+00> : vector<5x4x3xf32>
   affine.for %i0 = 0 to %M step 3 {
     affine.for %i1 = 0 to %N step 4 {
       affine.for %i2 = 0 to %O {
diff --git a/mlir/test/Transforms/Vectorize/materialize.mlir b/mlir/test/Transforms/Vectorize/materialize.mlir
index 210484494f2..9480cabc219 100644
--- a/mlir/test/Transforms/Vectorize/materialize.mlir
+++ b/mlir/test/Transforms/Vectorize/materialize.mlir
@@ -9,7 +9,7 @@
 // CHECK-LABEL: func @materialize
 func @materialize(%M : index, %N : index, %O : index, %P : index) {
   %A = alloc (%M, %N, %O, %P) : memref<?x?x?x?xf32, 0>
-  %f1 = constant dense<vector<4x4x4xf32>, 1.000000e+00>
+  %f1 = constant dense<1.000000e+00> : vector<4x4x4xf32>
   // CHECK:  affine.for %i0 = 0 to %arg0 step 4 {
   // CHECK-NEXT:    affine.for %i1 = 0 to %arg1 step 4 {
   // CHECK-NEXT:      affine.for %i2 = 0 to %arg2 {
diff --git a/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir b/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir
index ab962afa722..fd84f84b4b8 100644
--- a/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir
+++ b/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir
@@ -17,10 +17,10 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   // 4x unroll (jammed by construction).
   // CHECK: affine.for %i0 = 0 to %arg0 {
   // CHECK-NEXT:   affine.for %i1 = 0 to %arg1 step 32 {
-  // CHECK-NEXT:     %[[CST0:.*]] = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     %[[CST1:.*]] = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     %[[CST2:.*]] = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     %[[CST3:.*]] = constant dense<vector<8xf32>, 1.000000e+00>
+  // CHECK-NEXT:     %[[CST0:.*]] = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     %[[CST1:.*]] = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     %[[CST2:.*]] = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     %[[CST3:.*]] = constant dense<1.000000e+00> : vector<8xf32>
   // CHECK-NEXT:     %[[VAL00:.*]] = affine.apply [[ID1]]{{.*}}
   // CHECK-NEXT:     %[[VAL01:.*]] = affine.apply [[ID1]]{{.*}}
   // CHECK-NEXT:     vector.transfer_write %[[CST0]], {{.*}}[%[[VAL00]], %[[VAL01]]] {permutation_map: [[D0D1TOD1]]} : vector<8xf32>, memref<?x?xf32>
@@ -43,10 +43,10 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   // 4x unroll (jammed by construction).
   // CHECK: affine.for %i2 = 0 to %arg0 {
   // CHECK-NEXT:   affine.for %i3 = 0 to %arg1 step 32 {
-  // CHECK-NEXT:     %[[CST0:.*]] = constant dense<vector<8xf32>, 2.000000e+00>
-  // CHECK-NEXT:     %[[CST1:.*]] = constant dense<vector<8xf32>, 2.000000e+00>
-  // CHECK-NEXT:     %[[CST2:.*]] = constant dense<vector<8xf32>, 2.000000e+00>
-  // CHECK-NEXT:     %[[CST3:.*]] = constant dense<vector<8xf32>, 2.000000e+00>
+  // CHECK-NEXT:     %[[CST0:.*]] = constant dense<2.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     %[[CST1:.*]] = constant dense<2.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     %[[CST2:.*]] = constant dense<2.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     %[[CST3:.*]] = constant dense<2.000000e+00> : vector<8xf32>
   // CHECK-NEXT:     %[[VAL00:.*]] = affine.apply [[ID1]]{{.*}}
   // CHECK-NEXT:     %[[VAL01:.*]] = affine.apply [[ID1]]{{.*}}
   // CHECK-NEXT:     vector.transfer_write %[[CST0]], {{.*}}[%[[VAL00]], %[[VAL01]]] {permutation_map: [[D0D1TOD1]]} : vector<8xf32>, memref<?x?xf32>
diff --git a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir
index ffe350026c3..04b454067d3 100644
--- a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir
+++ b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir
@@ -17,12 +17,12 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   // (3x2)x unroll (jammed by construction).
   // CHECK: affine.for %i0 = 0 to %arg0 step 3 {
   // CHECK-NEXT:   affine.for %i1 = 0 to %arg1 step 16 {
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<8xf32>, 1.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<8xf32>, 1.000000e+00>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<8xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<8xf32>
   // CHECK-NEXT:     %[[VAL00:.*]] = affine.apply [[ID1]](%i0)
   // CHECK-NEXT:     %[[VAL01:.*]] = affine.apply [[ID1]](%i1)
   // CHECK-NEXT:     vector.transfer_write {{.*}}, {{.*}}[%[[VAL00]], %[[VAL01]]] {permutation_map: [[D0D1TOD1]]} : vector<8xf32>, memref<?x?xf32>
diff --git a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir
index f37d76296b6..6ad9c564614 100644
--- a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir
+++ b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir
@@ -15,8 +15,8 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   // 2x unroll (jammed by construction).
   // CHECK: affine.for %i0 = 0 to %arg0 step 3 {
   // CHECK-NEXT:   affine.for %i1 = 0 to %arg1 step 32 {
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<3x16xf32>, 1.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<3x16xf32>, 1.000000e+00>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<3x16xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<1.000000e+00> : vector<3x16xf32>
   // CHECK-NEXT:     %[[VAL00:.*]] = affine.apply [[ID1]](%i0)
   // CHECK-NEXT:     %[[VAL01:.*]] = affine.apply [[ID1]](%i1)
   // CHECK-NEXT:     vector.transfer_write {{.*}}, {{.*}}[%[[VAL00]], %[[VAL01]]] {permutation_map: [[ID2]]} : vector<3x16xf32>, memref<?x?xf32>
@@ -33,8 +33,8 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   // 2x unroll (jammed by construction).
   // CHECK: affine.for %i2 = 0 to %arg0 step 3 {
   // CHECK-NEXT:   affine.for %i3 = 0 to %arg1 step 32 {
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<3x16xf32>, 2.000000e+00>
-  // CHECK-NEXT:     {{.*}} = constant dense<vector<3x16xf32>, 2.000000e+00>
+  // CHECK-NEXT:     {{.*}} = constant dense<2.000000e+00> : vector<3x16xf32>
+  // CHECK-NEXT:     {{.*}} = constant dense<2.000000e+00> : vector<3x16xf32>
   // CHECK-NEXT:     %[[VAL00:.*]] = affine.apply [[ID1]](%i2)
   // CHECK-NEXT:     %[[VAL01:.*]] = affine.apply [[ID1]](%i3)
   // CHECK-NEXT:     vector.transfer_write {{.*}}, {{.*}}[%[[VAL00]], %[[VAL01]]] {permutation_map: [[ID2]]} : vector<3x16xf32>, memref<?x?xf32>
diff --git a/mlir/test/Transforms/Vectorize/vector_utils.mlir b/mlir/test/Transforms/Vectorize/vector_utils.mlir
index 8087bdb042e..e6d00b17130 100644
--- a/mlir/test/Transforms/Vectorize/vector_utils.mlir
+++ b/mlir/test/Transforms/Vectorize/vector_utils.mlir
@@ -13,17 +13,17 @@ func @vector_add_2d(%arg0: index, %arg1: index) -> f32 {
   %cst = constant 1.000000e+00 : f32
 
   // CHECK:matched: {{.*}} constant dense{{.*}} with shape ratio: 2, 32
-  %cst_1 = constant dense<vector<8x256xf32>, 1.000000e+00>
+  %cst_1 = constant dense<1.000000e+00> : vector<8x256xf32>
   // CHECK:matched: {{.*}} constant dense{{.*}} with shape ratio: 1, 3, 7, 2, 1
-  %cst_a = constant dense<vector<1x3x7x8x8xf32>, 1.000000e+00>
+  %cst_a = constant dense<1.000000e+00> : vector<1x3x7x8x8xf32>
   // CHECK-NOT:matched: {{.*}} constant dense{{.*}} with shape ratio: 1, 3, 7, 1{{.*}}
-  %cst_b = constant dense<vector<1x3x7x4x4xf32>, 1.000000e+00>
+  %cst_b = constant dense<1.000000e+00> : vector<1x3x7x4x4xf32>
   // TEST-3x4x5x8:matched: {{.*}} constant dense{{.*}} with shape ratio: 3, 2, 1, 4
-  %cst_c = constant dense<vector<3x4x5x8xf32>, 1.000000e+00>
+  %cst_c = constant dense<1.000000e+00> : vector<3x4x5x8xf32>
   // TEST-3x4x4x8-NOT:matched: {{.*}} constant dense{{.*}} with shape ratio{{.*}}
-  %cst_d = constant dense<vector<3x4x4x8xf32>, 1.000000e+00>
+  %cst_d = constant dense<1.000000e+00> : vector<3x4x4x8xf32>
   // TEST-3x4x4x8:matched: {{.*}} constant dense{{.*}} with shape ratio: 1, 1, 2, 16
-  %cst_e = constant dense<vector<1x2x10x32xf32>, 1.000000e+00>
+  %cst_e = constant dense<1.000000e+00> : vector<1x2x10x32xf32>
 
   // Nothing should be matched in this last block.
   // CHECK-NOT:matched: {{.*}} = constant 7{{.*}}
diff --git a/mlir/test/Transforms/Vectorize/vectorize_1d.mlir b/mlir/test/Transforms/Vectorize/vectorize_1d.mlir
index aea4d39e3f4..a6bf1d86ced 100644
--- a/mlir/test/Transforms/Vectorize/vectorize_1d.mlir
+++ b/mlir/test/Transforms/Vectorize/vectorize_1d.mlir
@@ -86,7 +86,7 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   %f2 = constant 2.0 : f32
   affine.for %i0 = 0 to %M {
     affine.for %i1 = 0 to %N {
-      // CHECK: [[C1:%.*]] = constant dense<vector<128xf32>, 1.000000e+00>
+      // CHECK: [[C1:%.*]] = constant dense<1.000000e+00> : vector<128xf32>
       // CHECK: vector.transfer_write [[C1]], {{.*}} {permutation_map: #[[map_proj_d0d1_d1]]} : vector<128xf32>, memref<?x?xf32>
       // non-scoped %f1
       store %f1, %A[%i0, %i1] : memref<?x?xf32, 0>
@@ -94,7 +94,7 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   }
   affine.for %i2 = 0 to %M {
     affine.for %i3 = 0 to %N {
-      // CHECK: [[C3:%.*]] = constant dense<vector<128xf32>, 2.000000e+00>
+      // CHECK: [[C3:%.*]] = constant dense<2.000000e+00> : vector<128xf32>
       // CHECK: vector.transfer_write [[C3]], {{.*}} {permutation_map: #[[map_proj_d0d1_d1]]} : vector<128xf32>, memref<?x?xf32>
       // non-scoped %f2
       store %f2, %B[%i2, %i3] : memref<?x?xf32, 0>
@@ -105,9 +105,9 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
       // CHECK: [[A5:%.*]] = vector.transfer_read %0[{{.*}}] {permutation_map: #[[map_proj_d0d1_d1]]} : memref<?x?xf32>, vector<128xf32>
       // CHECK: [[B5:%.*]] = vector.transfer_read %1[{{.*}}] {permutation_map: #[[map_proj_d0d1_d1]]} : memref<?x?xf32>, vector<128xf32>
       // CHECK: [[S5:%.*]] = addf [[A5]], [[B5]] : vector<128xf32>
-      // CHECK: [[SPLAT1:%.*]] = constant dense<vector<128xf32>, 1.000000e+00>
+      // CHECK: [[SPLAT1:%.*]] = constant dense<1.000000e+00> : vector<128xf32>
       // CHECK: [[S6:%.*]] = addf [[S5]], [[SPLAT1]] : vector<128xf32>
-      // CHECK: [[SPLAT2:%.*]] = constant dense<vector<128xf32>, 2.000000e+00>
+      // CHECK: [[SPLAT2:%.*]] = constant dense<2.000000e+00> : vector<128xf32>
       // CHECK: [[S7:%.*]] = addf [[S5]], [[SPLAT2]] : vector<128xf32>
       // CHECK: [[S8:%.*]] = addf [[S7]], [[S6]] : vector<128xf32>
       // CHECK: vector.transfer_write [[S8]], {{.*}} {permutation_map: #[[map_proj_d0d1_d1]]} : vector<128xf32>, memref<?x?xf32>
diff --git a/mlir/test/Transforms/Vectorize/vectorize_2d.mlir b/mlir/test/Transforms/Vectorize/vectorize_2d.mlir
index 871e8c364c8..6cbd4a4b7bb 100644
--- a/mlir/test/Transforms/Vectorize/vectorize_2d.mlir
+++ b/mlir/test/Transforms/Vectorize/vectorize_2d.mlir
@@ -53,7 +53,7 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   %f2 = constant 2.0 : f32
   affine.for %i0 = 0 to %M {
     affine.for %i1 = 0 to %N {
-      // CHECK: [[C1:%.*]] = constant dense<vector<32x256xf32>, 1.000000e+00>
+      // CHECK: [[C1:%.*]] = constant dense<1.000000e+00> : vector<32x256xf32>
       // CHECK: vector.transfer_write [[C1]], {{.*}} {permutation_map: #[[map_id2]]} : vector<32x256xf32>, memref<?x?xf32>
       // non-scoped %f1
       store %f1, %A[%i0, %i1] : memref<?x?xf32, 0>
@@ -61,7 +61,7 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
   }
   affine.for %i2 = 0 to %M {
     affine.for %i3 = 0 to %N {
-      // CHECK: [[C3:%.*]] = constant dense<vector<32x256xf32>, 2.000000e+00>
+      // CHECK: [[C3:%.*]] = constant dense<2.000000e+00> : vector<32x256xf32>
       // CHECK: vector.transfer_write [[C3]], {{.*}} {permutation_map: #[[map_id2]]}  : vector<32x256xf32>, memref<?x?xf32>
       // non-scoped %f2
       store %f2, %B[%i2, %i3] : memref<?x?xf32, 0>
@@ -72,9 +72,9 @@ func @vector_add_2d(%M : index, %N : index) -> f32 {
       // CHECK: [[A5:%.*]] = vector.transfer_read %0[{{.*}}] {permutation_map: #[[map_id2]]} : memref<?x?xf32>, vector<32x256xf32>
       // CHECK: [[B5:%.*]] = vector.transfer_read %1[{{.*}}] {permutation_map: #[[map_id2]]} : memref<?x?xf32>, vector<32x256xf32>
       // CHECK: [[S5:%.*]] = addf [[A5]], [[B5]] : vector<32x256xf32>
-      // CHECK: [[SPLAT1:%.*]] = constant dense<vector<32x256xf32>, 1.000000e+00>
+      // CHECK: [[SPLAT1:%.*]] = constant dense<1.000000e+00> : vector<32x256xf32>
       // CHECK: [[S6:%.*]] = addf [[S5]], [[SPLAT1]] : vector<32x256xf32>
-      // CHECK: [[SPLAT2:%.*]] = constant dense<vector<32x256xf32>, 2.000000e+00>
+      // CHECK: [[SPLAT2:%.*]] = constant dense<2.000000e+00> : vector<32x256xf32>
       // CHECK: [[S7:%.*]] = addf [[S5]], [[SPLAT2]] : vector<32x256xf32>
       // CHECK: [[S8:%.*]] = addf [[S7]], [[S6]] : vector<32x256xf32>
       // CHECK: vector.transfer_write [[S8]], {{.*}} {permutation_map: #[[map_id2]]} : vector<32x256xf32>, memref<?x?xf32>
@@ -109,7 +109,7 @@ func @vectorize_matmul(%arg0: memref<?x?xf32>, %arg1: memref<?x?xf32>, %arg2: me
   // VECT-NEXT: %[[N:.*]] = dim %arg2, 1 : memref<?x?xf32>
   //      VECT: {{.*}} #[[map_id1]](%[[M]]) step 4 {
   // VECT-NEXT:   {{.*}} #[[map_id1]](%[[N]]) step 8 {
-  //      VECT:     %[[VC0:.*]] = constant dense<vector<4x8xf32>, 0.000000e+00>
+  //      VECT:     %[[VC0:.*]] = constant dense<0.000000e+00> : vector<4x8xf32>
   // VECT-NEXT:     vector.transfer_write %[[VC0]], %arg2[%{{.*}}, %{{.*}}] {permutation_map: #[[map_id2]]} : vector<4x8xf32>, memref<?x?xf32>
   affine.for %i0 = (d0) -> (d0)(%c0) to (d0) -> (d0)(%M) {
     affine.for %i1 = (d0) -> (d0)(%c0) to (d0) -> (d0)(%N) {