Author: Henrich Lauko Date: 2026-03-14T16:35:27+01:00 New Revision: 38713d273dcc0374c543f645bf2ab1d1b74dd67c
URL: https://github.com/llvm/llvm-project/commit/38713d273dcc0374c543f645bf2ab1d1b74dd67c DIFF: https://github.com/llvm/llvm-project/commit/38713d273dcc0374c543f645bf2ab1d1b74dd67c.diff LOG: [CIR] Add Commutative/Idempotent traits to binary ops (#185163) Add missing MLIR traits to CIR binary operations: - AndOp, OrOp: Commutative, Idempotent - AddOp, MulOp, XorOp, MaxOp: Commutative Add these ops to the CIRCanonicalize pass op list so trait-based folding is exercised by applyOpPatternsGreedily. Added: clang/test/CIR/Transforms/binop-traits.cir Modified: clang/include/clang/CIR/Dialect/IR/CIROps.td clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp clang/test/CIR/CodeGen/binop.cpp clang/test/CIR/CodeGen/new.cpp clang/test/CIR/CodeGen/size-of-vla.cpp clang/test/CIR/CodeGen/throws.cpp clang/test/CIR/CodeGen/vla.c Removed: ################################################################################ diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td index a9b98b1f43b3f..742f25461e60d 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROps.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td @@ -2333,8 +2333,9 @@ def CIR_RemOp : CIR_BinaryOp<"rem", CIR_AnyArithType> { // AndOp //===----------------------------------------------------------------------===// -// FIXME: Commutative, Idempotent traits -def CIR_AndOp : CIR_BinaryOp<"and", CIR_AnyBitwiseType> { +def CIR_AndOp : CIR_BinaryOp<"and", CIR_AnyBitwiseType, [ + Commutative, Idempotent +]> { let summary = "Bitwise AND"; let description = [{ The `cir.and` operation performs a bitwise AND on integer operands. @@ -2353,8 +2354,9 @@ def CIR_AndOp : CIR_BinaryOp<"and", CIR_AnyBitwiseType> { // OrOp //===----------------------------------------------------------------------===// -// FIXME: Commutative, Idempotent traits -def CIR_OrOp : CIR_BinaryOp<"or", CIR_AnyBitwiseType> { +def CIR_OrOp : CIR_BinaryOp<"or", CIR_AnyBitwiseType, [ + Commutative, Idempotent +]> { let summary = "Bitwise OR"; let description = [{ The `cir.or` operation performs a bitwise OR on integer operands. @@ -2373,7 +2375,7 @@ def CIR_OrOp : CIR_BinaryOp<"or", CIR_AnyBitwiseType> { // XorOp //===----------------------------------------------------------------------===// -def CIR_XorOp : CIR_BinaryOp<"xor", CIR_AnyBitwiseType> { +def CIR_XorOp : CIR_BinaryOp<"xor", CIR_AnyBitwiseType, [Commutative]> { let summary = "Bitwise XOR"; let description = [{ The `cir.xor` operation performs a bitwise XOR on integer operands. @@ -2392,7 +2394,9 @@ def CIR_XorOp : CIR_BinaryOp<"xor", CIR_AnyBitwiseType> { // MaxOp //===----------------------------------------------------------------------===// -def CIR_MaxOp : CIR_BinaryOp<"max", CIR_AnyIntOrVecOfIntType> { +def CIR_MaxOp : CIR_BinaryOp<"max", CIR_AnyIntOrVecOfIntType, [ + Commutative, Idempotent +]> { let summary = "Integer maximum"; let description = [{ The `cir.max` operation computes the maximum of two integer operands. diff --git a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp index e9b825606a04e..46a8c011b320b 100644 --- a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp +++ b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp @@ -70,11 +70,12 @@ void CIRCanonicalizePass::runOnOperation() { // Many operations are here to perform a manual `fold` in // applyOpPatternsGreedily. - if (isa<BrOp, BrCondOp, CastOp, ScopeOp, SwitchOp, SelectOp, UnaryOp, - ComplexCreateOp, ComplexImagOp, ComplexRealOp, VecCmpOp, - VecCreateOp, VecExtractOp, VecShuffleOp, VecShuffleDynamicOp, - VecTernaryOp, BitClrsbOp, BitClzOp, BitCtzOp, BitFfsOp, BitParityOp, - BitPopcountOp, BitReverseOp, ByteSwapOp, RotateOp, ConstantOp>(op)) + if (isa<BrOp, BrCondOp, CastOp, ScopeOp, SwitchOp, SelectOp, UnaryOp, AddOp, + MulOp, AndOp, OrOp, XorOp, MaxOp, ComplexCreateOp, ComplexImagOp, + ComplexRealOp, VecCmpOp, VecCreateOp, VecExtractOp, VecShuffleOp, + VecShuffleDynamicOp, VecTernaryOp, BitClrsbOp, BitClzOp, BitCtzOp, + BitFfsOp, BitParityOp, BitPopcountOp, BitReverseOp, ByteSwapOp, + RotateOp, ConstantOp>(op)) ops.push_back(op); }); diff --git a/clang/test/CIR/CodeGen/binop.cpp b/clang/test/CIR/CodeGen/binop.cpp index 0a62ab87cf6fa..f55ff858bf79e 100644 --- a/clang/test/CIR/CodeGen/binop.cpp +++ b/clang/test/CIR/CodeGen/binop.cpp @@ -127,10 +127,10 @@ void b0(int a, int b) { // OGCG: ret void void testFloatingPointBinOps(float a, float b) { - a * b; - a / b; - a + b; - a - b; + float x = a * b; + x = x / b; + x = x + b; + x = x - b; } // CIR-LABEL: cir.func{{.*}} @_Z23testFloatingPointBinOpsff( @@ -144,48 +144,58 @@ void testFloatingPointBinOps(float a, float b) { // LLVM-SAME: float {{.*}} %[[A:.*]], float {{.*}} %[[B:.*]]) // LLVM: %[[A_ADDR:.*]] = alloca float, i64 1 // LLVM: %[[B_ADDR:.*]] = alloca float, i64 1 +// LLVM: %[[X_ADDR:.*]] = alloca float, i64 1 // LLVM: store float %[[A]], ptr %[[A_ADDR]] // LLVM: store float %[[B]], ptr %[[B_ADDR]] // LLVM: %[[A1:.*]] = load float, ptr %[[A_ADDR]] // LLVM: %[[B1:.*]] = load float, ptr %[[B_ADDR]] -// LLVM: fmul float %[[A1]], %[[B1]] +// LLVM: %[[MUL:.*]] = fmul float %[[A1]], %[[B1]] +// LLVM: store float %[[MUL]], ptr %[[X_ADDR]] -// LLVM: %[[A2:.*]] = load float, ptr %[[A_ADDR]] +// LLVM: %[[X1:.*]] = load float, ptr %[[X_ADDR]] // LLVM: %[[B2:.*]] = load float, ptr %[[B_ADDR]] -// LLVM: fdiv float %[[A2]], %[[B2]] +// LLVM: %[[DIV:.*]] = fdiv float %[[X1]], %[[B2]] +// LLVM: store float %[[DIV]], ptr %[[X_ADDR]] -// LLVM: %[[A3:.*]] = load float, ptr %[[A_ADDR]] +// LLVM: %[[X2:.*]] = load float, ptr %[[X_ADDR]] // LLVM: %[[B3:.*]] = load float, ptr %[[B_ADDR]] -// LLVM: fadd float %[[A3]], %[[B3]] +// LLVM: %[[ADD:.*]] = fadd float %[[X2]], %[[B3]] +// LLVM: store float %[[ADD]], ptr %[[X_ADDR]] -// LLVM: %[[A4:.*]] = load float, ptr %[[A_ADDR]] +// LLVM: %[[X3:.*]] = load float, ptr %[[X_ADDR]] // LLVM: %[[B4:.*]] = load float, ptr %[[B_ADDR]] -// LLVM: fsub float %[[A4]], %[[B4]] +// LLVM: %[[SUB:.*]] = fsub float %[[X3]], %[[B4]] +// LLVM: store float %[[SUB]], ptr %[[X_ADDR]] // LLVM: ret void // OGCG-LABEL: define{{.*}} void @_Z23testFloatingPointBinOpsff(float {{.*}} %a, float {{.*}} %b) // OGCG: %a.addr = alloca float // OGCG: %b.addr = alloca float +// OGCG: %x = alloca float // OGCG: store float %a, ptr %a.addr // OGCG: store float %b, ptr %b.addr // OGCG: %[[A1:.*]] = load float, ptr %a.addr // OGCG: %[[B1:.*]] = load float, ptr %b.addr -// OGCG: fmul float %[[A1]], %[[B1]] +// OGCG: %[[MUL:.*]] = fmul float %[[A1]], %[[B1]] +// OGCG: store float %[[MUL]], ptr %x -// OGCG: %[[A2:.*]] = load float, ptr %a.addr +// OGCG: %[[X1:.*]] = load float, ptr %x // OGCG: %[[B2:.*]] = load float, ptr %b.addr -// OGCG: fdiv float %[[A2]], %[[B2]] +// OGCG: %[[DIV:.*]] = fdiv float %[[X1]], %[[B2]] +// OGCG: store float %[[DIV]], ptr %x -// OGCG: %[[A3:.*]] = load float, ptr %a.addr +// OGCG: %[[X2:.*]] = load float, ptr %x // OGCG: %[[B3:.*]] = load float, ptr %b.addr -// OGCG: fadd float %[[A3]], %[[B3]] +// OGCG: %[[ADD:.*]] = fadd float %[[X2]], %[[B3]] +// OGCG: store float %[[ADD]], ptr %x -// OGCG: %[[A4:.*]] = load float, ptr %a.addr +// OGCG: %[[X3:.*]] = load float, ptr %x // OGCG: %[[B4:.*]] = load float, ptr %b.addr -// OGCG: fsub float %[[A4]], %[[B4]] +// OGCG: %[[SUB:.*]] = fsub float %[[X3]], %[[B4]] +// OGCG: store float %[[SUB]], ptr %x // OGCG: ret void diff --git a/clang/test/CIR/CodeGen/new.cpp b/clang/test/CIR/CodeGen/new.cpp index 81e513a5d7ac2..671de964e7d15 100644 --- a/clang/test/CIR/CodeGen/new.cpp +++ b/clang/test/CIR/CodeGen/new.cpp @@ -551,19 +551,14 @@ void t_new_var_size5(int n) { auto p = new double[n][2][3]; } -// NUM_ELEMENTS isn't used in this case because there is no cookie. It isn't -// used in the allocation size because the allocation size is calculated with -// the element size and the fixed size dimensions already combined (6 * 8 = 48). -// We don't DCE NUM_ELEMENTS because it's not a constant, but later -// optimizations will eliminate it. +// The allocation size is calculated with the element size and the fixed size +// dimensions already combined (6 * 8 = 48). // CHECK: cir.func {{.*}} @_Z15t_new_var_size5i // CHECK: %[[N:.*]] = cir.load{{.*}} %[[ARG_ALLOCA:.*]] // CHECK: %[[N_SIZE_T:.*]] = cir.cast integral %[[N]] : !s32i -> !u64i // CHECK: %[[ELEMENT_SIZE:.*]] = cir.const #cir.int<48> : !u64i // CHECK: %[[RESULT:.*]], %[[OVERFLOW:.*]] = cir.binop.overflow(mul, %[[N_SIZE_T]], %[[ELEMENT_SIZE]]) : !u64i, (!u64i, !cir.bool) -// CHECK: %[[NUM_ELEMENTS_MULTIPLIER:.*]] = cir.const #cir.int<6> -// CHECK: %[[NUM_ELEMENTS:.*]] = cir.mul %[[N_SIZE_T]], %[[NUM_ELEMENTS_MULTIPLIER]] : !u64i // CHECK: %[[ALL_ONES:.*]] = cir.const #cir.int<18446744073709551615> : !u64i // CHECK: %[[ALLOC_SIZE:.*]] = cir.select if %[[OVERFLOW]] then %[[ALL_ONES]] else %[[RESULT]] : (!cir.bool, !u64i, !u64i) // CHECK: %[[PTR:.*]] = cir.call @_Znam(%[[ALLOC_SIZE]]) {allocsize = array<i32: 0>, builtin} : (!u64i {llvm.noundef}) diff --git a/clang/test/CIR/CodeGen/size-of-vla.cpp b/clang/test/CIR/CodeGen/size-of-vla.cpp index 789e97f40440b..c6838155189ef 100644 --- a/clang/test/CIR/CodeGen/size-of-vla.cpp +++ b/clang/test/CIR/CodeGen/size-of-vla.cpp @@ -38,9 +38,9 @@ void vla_type_with_element_type_int() { // CIR: %[[SIZE_ADDR:.*]] = cir.alloca !u64i, !cir.ptr<!u64i>, ["size", init] // CIR: %[[CONST_10:.*]] = cir.const #cir.int<10> : !u64i // CIR: cir.store {{.*}} %[[CONST_10]], %[[N_ADDR]] : !u64i, !cir.ptr<!u64i> -// CIR: %3 = cir.load {{.*}} %[[N_ADDR]] : !cir.ptr<!u64i>, !u64i +// CIR: %[[TMP_N:.*]] = cir.load {{.*}} %[[N_ADDR]] : !cir.ptr<!u64i>, !u64i // CIR: %[[CONST_4:.*]] = cir.const #cir.int<4> : !u64i -// CIR: %[[SIZE:.*]] = cir.mul nuw %[[CONST_4]], %3 : !u64i +// CIR: %[[SIZE:.*]] = cir.mul nuw %[[CONST_4]], %[[TMP_N]] : !u64i // CIR: cir.store {{.*}} %[[SIZE]], %[[SIZE_ADDR]] : !u64i, !cir.ptr<!u64i> // LLVM: %[[N_ADDR:.*]] = alloca i64, i64 1, align 8 diff --git a/clang/test/CIR/CodeGen/throws.cpp b/clang/test/CIR/CodeGen/throws.cpp index f482fb48b0205..c4afb84f09f95 100644 --- a/clang/test/CIR/CodeGen/throws.cpp +++ b/clang/test/CIR/CodeGen/throws.cpp @@ -112,9 +112,7 @@ void paren_expr() { (throw 0, 1 + 2); } // CIR: cir.throw %[[EXCEPTION_ADDR]] : !cir.ptr<!s32i>, @_ZTIi // CIR: cir.unreachable // CIR: ^bb1: -// CIR: %[[CONST_1:.*]] = cir.const #cir.int<1> : !s32i -// CIR: %[[CONST_2:.*]] = cir.const #cir.int<2> : !s32i -// CIR: %[[ADD:.*]] = cir.add nsw %[[CONST_1]], %[[CONST_2]] : !s32i +// CIR: cir.return // LLVM: %[[EXCEPTION_ADDR:.*]] = call ptr @__cxa_allocate_exception(i64 4) // LLVM: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16 diff --git a/clang/test/CIR/CodeGen/vla.c b/clang/test/CIR/CodeGen/vla.c index 1489db643125a..3a85c1c45a4c1 100644 --- a/clang/test/CIR/CodeGen/vla.c +++ b/clang/test/CIR/CodeGen/vla.c @@ -359,9 +359,9 @@ void vla_subscript_expr() { // CIR: cir.store {{.*}} %[[A_VAL]], %[[COMPOUND_ADDR]] : !cir.ptr<!cir.ptr<!s32i>>, !cir.ptr<!cir.ptr<!cir.ptr<!s32i>>> // CIR: %[[TMP_COMPOUND:.*]] = cir.load {{.*}} %[[COMPOUND_ADDR]] : !cir.ptr<!cir.ptr<!cir.ptr<!s32i>>>, !cir.ptr<!cir.ptr<!s32i>> // CIR: %[[COMPOUND_PTR:.*]] = cir.ptr_stride %[[TMP_COMPOUND]], %[[CONST_0]] : (!cir.ptr<!cir.ptr<!s32i>>, !s32i) -> !cir.ptr<!cir.ptr<!s32i>> -// CIR: %[[TMP_COMPOUND:.*]] = cir.load {{.*}} %10 : !cir.ptr<!cir.ptr<!s32i>>, !cir.ptr<!s32i> +// CIR: %[[TMP_COMPOUND:.*]] = cir.load {{.*}} %[[COMPOUND_PTR]] : !cir.ptr<!cir.ptr<!s32i>>, !cir.ptr<!s32i> // CIR: %[[CONST_1:.*]] = cir.const #cir.int<1> : !u64i -// CIR: %[[VLA_IDX:.*]] = cir.mul nsw %[[CONST_1]], %7 : !u64i +// CIR: %[[VLA_IDX:.*]] = cir.mul nsw %[[CONST_1]], %[[TMP_N]] : !u64i // CIR: %[[VLA_A_PTR:.*]] = cir.ptr_stride %[[TMP_COMPOUND]], %[[VLA_IDX]] : (!cir.ptr<!s32i>, !u64i) -> !cir.ptr<!s32i> // CIR: %[[ELEM_5_PTR:.*]] = cir.ptr_stride %[[VLA_A_PTR]], %[[CONST_5]] : (!cir.ptr<!s32i>, !s32i) -> !cir.ptr<!s32i> // CIR: cir.store {{.*}} %[[CONST_0_VAL]], %[[ELEM_5_PTR]] : !s32i, !cir.ptr<!s32i> diff --git a/clang/test/CIR/Transforms/binop-traits.cir b/clang/test/CIR/Transforms/binop-traits.cir new file mode 100644 index 0000000000000..b82f9b47d433c --- /dev/null +++ b/clang/test/CIR/Transforms/binop-traits.cir @@ -0,0 +1,49 @@ +// RUN: cir-opt %s -cir-canonicalize -o - | FileCheck %s + +!s32i = !cir.int<s, 32> + +// CHECK-LABEL: @and_idempotent +// CHECK-NEXT: cir.return %arg0 +cir.func @and_idempotent(%arg0 : !s32i) -> !s32i { + %0 = cir.and %arg0, %arg0 : !s32i + cir.return %0 : !s32i +} + +// CHECK-LABEL: @or_idempotent +// CHECK-NEXT: cir.return %arg0 +cir.func @or_idempotent(%arg0 : !s32i) -> !s32i { + %0 = cir.or %arg0, %arg0 : !s32i + cir.return %0 : !s32i +} + +// CHECK-LABEL: @and_commutative +// CHECK: cir.and %arg0, %{{.*}} : !s32i +cir.func @and_commutative(%arg0 : !s32i) -> !s32i { + %0 = cir.const #cir.int<42> : !s32i + %1 = cir.and %0, %arg0 : !s32i + cir.return %1 : !s32i +} + +// CHECK-LABEL: @or_commutative +// CHECK: cir.or %arg0, %{{.*}} : !s32i +cir.func @or_commutative(%arg0 : !s32i) -> !s32i { + %0 = cir.const #cir.int<42> : !s32i + %1 = cir.or %0, %arg0 : !s32i + cir.return %1 : !s32i +} + +// CHECK-LABEL: @xor_commutative +// CHECK: cir.xor %arg0, %{{.*}} : !s32i +cir.func @xor_commutative(%arg0 : !s32i) -> !s32i { + %0 = cir.const #cir.int<42> : !s32i + %1 = cir.xor %0, %arg0 : !s32i + cir.return %1 : !s32i +} + +// CHECK-LABEL: @max_commutative +// CHECK: cir.max %arg0, %{{.*}} : !s32i +cir.func @max_commutative(%arg0 : !s32i) -> !s32i { + %0 = cir.const #cir.int<42> : !s32i + %1 = cir.max %0, %arg0 : !s32i + cir.return %1 : !s32i +} _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
