Author: Amr Hesham Date: 2025-06-07T13:58:54+02:00 New Revision: 995d74f8663edb2e20f2d2672556582a6f4cc3f1
URL: https://github.com/llvm/llvm-project/commit/995d74f8663edb2e20f2d2672556582a6f4cc3f1 DIFF: https://github.com/llvm/llvm-project/commit/995d74f8663edb2e20f2d2672556582a6f4cc3f1.diff LOG: [CIR] Implement folder for VecTernaryOp (#142946) This change adds a folder for the VecTernaryOp Issue https://github.com/llvm/llvm-project/issues/136487 Added: clang/test/CIR/Transforms/vector-ternary-fold.cir Modified: clang/include/clang/CIR/Dialect/IR/CIROps.td clang/lib/CIR/Dialect/IR/CIRDialect.cpp clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp Removed: ################################################################################ diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td index 8b584e81b8a2b..038a59b8ff4eb 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROps.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td @@ -2270,7 +2270,9 @@ def VecTernaryOp : CIR_Op<"vec.ternary", `(` $cond `,` $lhs`,` $rhs `)` `:` qualified(type($cond)) `,` qualified(type($lhs)) attr-dict }]; + let hasVerifier = 1; + let hasFolder = 1; } #endif // CLANG_CIR_DIALECT_IR_CIROPS_TD diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index 7f09830576181..bfd3a0a62a8e7 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -1664,6 +1664,38 @@ LogicalResult cir::VecTernaryOp::verify() { return success(); } +OpFoldResult cir::VecTernaryOp::fold(FoldAdaptor adaptor) { + mlir::Attribute cond = adaptor.getCond(); + mlir::Attribute lhs = adaptor.getLhs(); + mlir::Attribute rhs = adaptor.getRhs(); + + if (!mlir::isa_and_nonnull<cir::ConstVectorAttr>(cond) || + !mlir::isa_and_nonnull<cir::ConstVectorAttr>(lhs) || + !mlir::isa_and_nonnull<cir::ConstVectorAttr>(rhs)) + return {}; + auto condVec = mlir::cast<cir::ConstVectorAttr>(cond); + auto lhsVec = mlir::cast<cir::ConstVectorAttr>(lhs); + auto rhsVec = mlir::cast<cir::ConstVectorAttr>(rhs); + + mlir::ArrayAttr condElts = condVec.getElts(); + + SmallVector<mlir::Attribute, 16> elements; + elements.reserve(condElts.size()); + + for (const auto &[idx, condAttr] : + llvm::enumerate(condElts.getAsRange<cir::IntAttr>())) { + if (condAttr.getSInt()) { + elements.push_back(lhsVec.getElts()[idx]); + } else { + elements.push_back(rhsVec.getElts()[idx]); + } + } + + cir::VectorType vecTy = getLhs().getType(); + return cir::ConstVectorAttr::get( + vecTy, mlir::ArrayAttr::get(getContext(), elements)); +} + //===----------------------------------------------------------------------===// // TableGen'd op method definitions //===----------------------------------------------------------------------===// diff --git a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp index 7d03e374c27e8..33881c69eec5f 100644 --- a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp +++ b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp @@ -138,10 +138,11 @@ void CIRCanonicalizePass::runOnOperation() { assert(!cir::MissingFeatures::complexRealOp()); assert(!cir::MissingFeatures::complexImagOp()); assert(!cir::MissingFeatures::callOp()); - // CastOp, UnaryOp, VecExtractOp and VecShuffleDynamicOp are here to perform - // a manual `fold` in applyOpPatternsGreedily. + + // Many operations are here to perform a manual `fold` in + // applyOpPatternsGreedily. if (isa<BrOp, BrCondOp, CastOp, ScopeOp, SwitchOp, SelectOp, UnaryOp, - VecExtractOp, VecShuffleDynamicOp>(op)) + VecExtractOp, VecShuffleDynamicOp, VecTernaryOp>(op)) ops.push_back(op); }); diff --git a/clang/test/CIR/Transforms/vector-ternary-fold.cir b/clang/test/CIR/Transforms/vector-ternary-fold.cir new file mode 100644 index 0000000000000..f2e18576da74b --- /dev/null +++ b/clang/test/CIR/Transforms/vector-ternary-fold.cir @@ -0,0 +1,20 @@ +// RUN: cir-opt %s -cir-canonicalize -o - | FileCheck %s + +!s32i = !cir.int<s, 32> + +module { + cir.func @vector_ternary_fold_test() -> !cir.vector<4 x !s32i> { + %cond = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<0> : !s32i, #cir.int<1> : !s32i, #cir.int<0> : !s32i]> : !cir.vector<4 x !s32i> + %lhs = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<3> : !s32i, #cir.int<4> : !s32i]> : !cir.vector<4 x !s32i> + %rhs = cir.const #cir.const_vector<[#cir.int<5> : !s32i, #cir.int<6> : !s32i, #cir.int<7> : !s32i, #cir.int<8> : !s32i]> : !cir.vector<4 x !s32i> + %res = cir.vec.ternary(%cond, %lhs, %rhs) : !cir.vector<4 x !s32i>, !cir.vector<4 x !s32i> + cir.return %res : !cir.vector<4 x !s32i> + } + + // [1, 0, 1, 0] ? [1, 2, 3, 4] : [5, 6, 7, 8] Will be fold to [1, 6, 3, 8] + // CHECK: cir.func @vector_ternary_fold_test() -> !cir.vector<4 x !s32i> { + // CHECK-NEXT: %[[RES:.*]] = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<6> : !s32i, #cir.int<3> : !s32i, #cir.int<8> : !s32i]> : !cir.vector<4 x !s32i> + // CHECK-NEXT: cir.return %[[RES]] : !cir.vector<4 x !s32i> +} + + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
