From 844fe8f662de6d1a51f4a04b37fadb96b2009bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20Warzy=C5=84ski?= Date: Fri, 8 Nov 2024 13:50:04 +0000 Subject: [PATCH] [mlir][nfc] Rename @genbool_* as @constant_mask_* (#115335) Renames `@genbool_*` tests as `@constant_mask_*`. That's to better highlight which Op is tested and for better consistency with other test. In addition,`@genbool_2d` is moved _above_ it's counterparts with scalable vectors (again, for consistency). --- .../VectorToLLVM/vector-to-llvm.mlir | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir b/mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir index c1de24fd0403ce..03bcb341efea2f 100644 --- a/mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir +++ b/mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir @@ -2685,61 +2685,77 @@ func.func @matrix_ops_index(%A: vector<64xindex>, %B: vector<48xindex>) -> vecto // ----- -func.func @genbool_0d_f() -> vector { +func.func @constant_mask_0d_f() -> vector { %0 = vector.constant_mask [0] : vector return %0 : vector } -// CHECK-LABEL: func @genbool_0d_f +// CHECK-LABEL: func @constant_mask_0d_f // CHECK: %[[VAL_0:.*]] = arith.constant dense : vector // CHECK: return %[[VAL_0]] : vector // ----- -func.func @genbool_0d_t() -> vector { +func.func @constant_mask_0d_t() -> vector { %0 = vector.constant_mask [1] : vector return %0 : vector } -// CHECK-LABEL: func @genbool_0d_t +// CHECK-LABEL: func @constant_mask_0d_t // CHECK: %[[VAL_0:.*]] = arith.constant dense : vector // CHECK: return %[[VAL_0]] : vector // ----- -func.func @genbool_1d() -> vector<8xi1> { +func.func @constant_mask_1d() -> vector<8xi1> { %0 = vector.constant_mask [4] : vector<8xi1> return %0 : vector<8xi1> } -// CHECK-LABEL: func @genbool_1d +// CHECK-LABEL: func @constant_mask_1d // CHECK: %[[VAL_0:.*]] = arith.constant dense<[true, true, true, true, false, false, false, false]> : vector<8xi1> // CHECK: return %[[VAL_0]] : vector<8xi1> // ----- -func.func @genbool_1d_scalable_all_false() -> vector<[8]xi1> { +func.func @constant_mask_1d_scalable_all_false() -> vector<[8]xi1> { %0 = vector.constant_mask [0] : vector<[8]xi1> return %0 : vector<[8]xi1> } -// CHECK-LABEL: func @genbool_1d_scalable_all_false +// CHECK-LABEL: func @constant_mask_1d_scalable_all_false // CHECK: %[[VAL_0:.*]] = arith.constant dense : vector<[8]xi1> // CHECK: return %[[VAL_0]] : vector<[8]xi1> // ----- -func.func @genbool_1d_scalable_all_true() -> vector<[8]xi1> { +func.func @constant_mask_1d_scalable_all_true() -> vector<[8]xi1> { %0 = vector.constant_mask [8] : vector<[8]xi1> return %0 : vector<[8]xi1> } -// CHECK-LABEL: func @genbool_1d_scalable_all_true +// CHECK-LABEL: func @constant_mask_1d_scalable_all_true // CHECK: %[[VAL_0:.*]] = arith.constant dense : vector<[8]xi1> // CHECK: return %[[VAL_0]] : vector<[8]xi1> // ----- -func.func @genbool_2d_trailing_scalable() -> vector<4x[4]xi1> { +func.func @constant_mask_2d() -> vector<4x4xi1> { + %v = vector.constant_mask [2, 2] : vector<4x4xi1> + return %v: vector<4x4xi1> +} + +// CHECK-LABEL: func @constant_mask_2d +// CHECK: %[[VAL_0:.*]] = arith.constant dense<[true, true, false, false]> : vector<4xi1> +// CHECK: %[[VAL_1:.*]] = arith.constant dense : vector<4x4xi1> +// CHECK: %[[VAL_2:.*]] = builtin.unrealized_conversion_cast %[[VAL_1]] : vector<4x4xi1> to !llvm.array<4 x vector<4xi1>> +// CHECK: %[[VAL_3:.*]] = llvm.insertvalue %[[VAL_0]], %[[VAL_2]][0] : !llvm.array<4 x vector<4xi1>> +// CHECK: %[[VAL_4:.*]] = llvm.insertvalue %[[VAL_0]], %[[VAL_3]][1] : !llvm.array<4 x vector<4xi1>> +// CHECK: %[[VAL_5:.*]] = builtin.unrealized_conversion_cast %[[VAL_4]] : !llvm.array<4 x vector<4xi1>> to vector<4x4xi1> +// CHECK: return %[[VAL_5]] : vector<4x4xi1> + +// ----- + +func.func @constant_mask_2d_trailing_scalable() -> vector<4x[4]xi1> { %0 = vector.constant_mask [2, 4] : vector<4x[4]xi1> return %0 : vector<4x[4]xi1> } -// CHECK-LABEL: func.func @genbool_2d_trailing_scalable +// CHECK-LABEL: func.func @constant_mask_2d_trailing_scalable // CHECK: %[[VAL_0:.*]] = arith.constant dense : vector<[4]xi1> // CHECK: %[[VAL_1:.*]] = arith.constant dense : vector<4x[4]xi1> // CHECK: %[[VAL_2:.*]] = builtin.unrealized_conversion_cast %[[VAL_1]] : vector<4x[4]xi1> to !llvm.array<4 x vector<[4]xi1>> @@ -2752,32 +2768,16 @@ func.func @genbool_2d_trailing_scalable() -> vector<4x[4]xi1> { /// Currently, this is not supported as generating the mask would require /// unrolling the leading scalable dimension at compile time. -func.func @cannot_genbool_2d_leading_scalable() -> vector<[4]x4xi1> { +func.func @negative_constant_mask_2d_leading_scalable() -> vector<[4]x4xi1> { %0 = vector.constant_mask [4, 2] : vector<[4]x4xi1> return %0 : vector<[4]x4xi1> } -// CHECK-LABEL: func.func @cannot_genbool_2d_leading_scalable +// CHECK-LABEL: func.func @negative_constant_mask_2d_leading_scalable // CHECK: %[[VAL_0:.*]] = vector.constant_mask [4, 2] : vector<[4]x4xi1> // CHECK: return %[[VAL_0]] : vector<[4]x4xi1> // ----- -func.func @genbool_2d() -> vector<4x4xi1> { - %v = vector.constant_mask [2, 2] : vector<4x4xi1> - return %v: vector<4x4xi1> -} - -// CHECK-LABEL: func @genbool_2d -// CHECK: %[[VAL_0:.*]] = arith.constant dense<[true, true, false, false]> : vector<4xi1> -// CHECK: %[[VAL_1:.*]] = arith.constant dense : vector<4x4xi1> -// CHECK: %[[VAL_2:.*]] = builtin.unrealized_conversion_cast %[[VAL_1]] : vector<4x4xi1> to !llvm.array<4 x vector<4xi1>> -// CHECK: %[[VAL_3:.*]] = llvm.insertvalue %[[VAL_0]], %[[VAL_2]][0] : !llvm.array<4 x vector<4xi1>> -// CHECK: %[[VAL_4:.*]] = llvm.insertvalue %[[VAL_0]], %[[VAL_3]][1] : !llvm.array<4 x vector<4xi1>> -// CHECK: %[[VAL_5:.*]] = builtin.unrealized_conversion_cast %[[VAL_4]] : !llvm.array<4 x vector<4xi1>> to vector<4x4xi1> -// CHECK: return %[[VAL_5]] : vector<4x4xi1> - -// ----- - func.func @create_mask_0d(%a : index) -> vector { %v = vector.create_mask %a : vector return %v: vector