From bf8701ffb4fe40edd04b3ae40469af9bf57cdf66 Mon Sep 17 00:00:00 2001 From: AmrDeveloper Date: Tue, 13 May 2025 20:33:28 +0200 Subject: [PATCH] [CIR] Backport folder implementation for VecExtractOp --- clang/include/clang/CIR/Dialect/IR/CIROps.td | 1 + clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 23 +++++++++++++ .../Dialect/Transforms/CIRCanonicalize.cpp | 17 ++++++---- .../CIR/Transforms/vector-extract-fold.cir | 33 +++++++++++++++++++ 4 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 clang/test/CIR/Transforms/vector-extract-fold.cir diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td index 7ca31a83ecaa..053c7f135dba 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROps.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td @@ -3162,6 +3162,7 @@ def VecExtractOp : CIR_Op<"vec.extract", [Pure, }]; let llvmOp = "ExtractElementOp"; + let hasFolder = 1; } //===----------------------------------------------------------------------===// diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index 16238ece7b84..d3d89685b268 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -1111,6 +1111,29 @@ LogicalResult cir::VecShuffleDynamicOp::verify() { return success(); } +//===----------------------------------------------------------------------===// +// VecExtractOp +//===----------------------------------------------------------------------===// + +OpFoldResult cir::VecExtractOp::fold(FoldAdaptor adaptor) { + const auto vectorAttr = + llvm::dyn_cast_if_present(adaptor.getVec()); + if (!vectorAttr) + return {}; + + const auto indexAttr = + llvm::dyn_cast_if_present(adaptor.getIndex()); + if (!indexAttr) + return {}; + + const mlir::ArrayAttr elements = vectorAttr.getElts(); + const uint64_t index = indexAttr.getUInt(); + if (index >= elements.size()) + return {}; + + return elements[index]; +} + //===----------------------------------------------------------------------===// // ReturnOp //===----------------------------------------------------------------------===// diff --git a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp index 0ce8e71036b0..f849b6cc08f8 100644 --- a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp +++ b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp @@ -79,9 +79,9 @@ struct RemoveEmptyScope : public OpRewritePattern { struct RemoveEmptySwitch : public OpRewritePattern { using OpRewritePattern::OpRewritePattern; - LogicalResult matchAndRewrite(SwitchOp op, PatternRewriter &rewriter) const final { - if (!(op.getBody().empty() || - isa(op.getBody().front().front()))) + LogicalResult matchAndRewrite(SwitchOp op, + PatternRewriter &rewriter) const final { + if (!(op.getBody().empty() || isa(op.getBody().front().front()))) return failure(); rewriter.eraseOp(op); @@ -92,7 +92,8 @@ struct RemoveEmptySwitch : public OpRewritePattern { struct RemoveTrivialTry : public OpRewritePattern { using OpRewritePattern::OpRewritePattern; - LogicalResult matchAndRewrite(TryOp op, PatternRewriter &rewriter) const final { + LogicalResult matchAndRewrite(TryOp op, + PatternRewriter &rewriter) const final { // FIXME: also check all catch regions are empty // return success(op.getTryRegion().hasOneBlock()); return mlir::failure(); @@ -116,7 +117,8 @@ struct RemoveTrivialTry : public OpRewritePattern { struct SimplifyCallOp : public OpRewritePattern { using OpRewritePattern::OpRewritePattern; - LogicalResult matchAndRewrite(CallOp op, PatternRewriter &rewriter) const final { + LogicalResult matchAndRewrite(CallOp op, + PatternRewriter &rewriter) const final { // Applicable to cir.call exception ... clean { cir.yield } mlir::Region *r = &op.getCleanup(); if (r->empty() || !r->hasOneBlock()) @@ -174,10 +176,11 @@ void CIRCanonicalizePass::runOnOperation() { // Collect operations to apply patterns. llvm::SmallVector ops; getOperation()->walk([&](Operation *op) { - // CastOp and UnaryOp are here to perform a manual `fold` in + // CastOp, UnaryOp and VecExtractOp are here to perform a manual `fold` in // applyOpPatternsGreedily. if (isa(op)) + ComplexCreateOp, ComplexRealOp, ComplexImagOp, CallOp, + VecExtractOp>(op)) ops.push_back(op); }); diff --git a/clang/test/CIR/Transforms/vector-extract-fold.cir b/clang/test/CIR/Transforms/vector-extract-fold.cir new file mode 100644 index 000000000000..1e4703756627 --- /dev/null +++ b/clang/test/CIR/Transforms/vector-extract-fold.cir @@ -0,0 +1,33 @@ +// RUN: cir-opt %s -cir-canonicalize -o - | FileCheck %s + +!s32i = !cir.int + +module { + cir.func @fold_extract_vector_op_test() { + %init = cir.alloca !s32i, !cir.ptr, ["e", init] + %const_vec = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<3> : !s32i, #cir.int<4> : !s32i]> : !cir.vector + %index = cir.const #cir.int<1> : !s32i + %ele = cir.vec.extract %const_vec[%index : !s32i] : !cir.vector + cir.store %ele, %init : !s32i, !cir.ptr + cir.return + } + + // CHECK: %[[INIT:.*]] = cir.alloca !s32i, !cir.ptr, ["e", init] + // CHECK: %[[VALUE:.*]] = cir.const #cir.int<2> : !s32i + // CHECK: cir.store %[[VALUE]], %[[INIT]] : !s32i, !cir.ptr + + cir.func @fold_extract_vector_op_index_out_of_bounds_test() { + %init = cir.alloca !s32i, !cir.ptr, ["e", init] + %const_vec = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<3> : !s32i, #cir.int<4> : !s32i]> : !cir.vector + %index = cir.const #cir.int<9> : !s32i + %ele = cir.vec.extract %const_vec[%index : !s32i] : !cir.vector + cir.store %ele, %init : !s32i, !cir.ptr + cir.return + } + + // CHECK: %[[INIT:.*]] = cir.alloca !s32i, !cir.ptr, ["e", init] + // CHECK: %[[CONST_VEC:.*]] = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<3> : !s32i, #cir.int<4> : !s32i]> : !cir.vector + // CHECK: %[[INDEX:.*]] = cir.const #cir.int<9> : !s32i + // CHECK: %[[ELE:.*]] = cir.vec.extract %[[CONST_VEC]][%[[INDEX]] : !s32i] : !cir.vector + // CHECK: cir.store %[[ELE]], %[[INIT]] : !s32i, !cir.ptr +}