Skip to content

[CIR] Backport folder implementation for VecExtractOp #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2025
Merged

[CIR] Backport folder implementation for VecExtractOp #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clang/include/clang/CIR/Dialect/IR/CIROps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3162,6 +3162,7 @@ def VecExtractOp : CIR_Op<"vec.extract", [Pure,
}];

let llvmOp = "ExtractElementOp";
let hasFolder = 1;
}

//===----------------------------------------------------------------------===//
Expand Down
23 changes: 23 additions & 0 deletions clang/lib/CIR/Dialect/IR/CIRDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<cir::ConstVectorAttr>(adaptor.getVec());
if (!vectorAttr)
return {};

const auto indexAttr =
llvm::dyn_cast_if_present<cir::IntAttr>(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
//===----------------------------------------------------------------------===//
Expand Down
17 changes: 10 additions & 7 deletions clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ struct RemoveEmptyScope : public OpRewritePattern<ScopeOp> {
struct RemoveEmptySwitch : public OpRewritePattern<SwitchOp> {
using OpRewritePattern<SwitchOp>::OpRewritePattern;

LogicalResult matchAndRewrite(SwitchOp op, PatternRewriter &rewriter) const final {
if (!(op.getBody().empty() ||
isa<YieldOp>(op.getBody().front().front())))
LogicalResult matchAndRewrite(SwitchOp op,
PatternRewriter &rewriter) const final {
if (!(op.getBody().empty() || isa<YieldOp>(op.getBody().front().front())))
return failure();

rewriter.eraseOp(op);
Expand All @@ -92,7 +92,8 @@ struct RemoveEmptySwitch : public OpRewritePattern<SwitchOp> {
struct RemoveTrivialTry : public OpRewritePattern<TryOp> {
using OpRewritePattern<TryOp>::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();
Expand All @@ -116,7 +117,8 @@ struct RemoveTrivialTry : public OpRewritePattern<TryOp> {
struct SimplifyCallOp : public OpRewritePattern<CallOp> {
using OpRewritePattern<CallOp>::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())
Expand Down Expand Up @@ -174,10 +176,11 @@ void CIRCanonicalizePass::runOnOperation() {
// Collect operations to apply patterns.
llvm::SmallVector<Operation *, 16> 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.
Comment on lines +179 to 180
Copy link
Collaborator

@xlauko xlauko May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bcardosolopes do you want to keep these operations in the non-canonicalized IR?
It might be possible to directly create them using OpBuilder::createOrFold in codegen which will eliminate the need to fold here. But it might be worth to be able to have unfolded version too, so I am just asking.

Copy link
Member

@bcardosolopes bcardosolopes May 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xlauko good question, I wasn't aware of createOrFold actually, neat. I guess it really depends on optimization level given we might be folding too much if we are emitting things to be statically analyzed? I don't have a concrete example though. A good answer could be: on a case basis during CIRGen if it doesn't look like affecting analysis quality?

if (isa<BrOp, BrCondOp, ScopeOp, SwitchOp, CastOp, TryOp, UnaryOp, SelectOp,
ComplexCreateOp, ComplexRealOp, ComplexImagOp, CallOp>(op))
ComplexCreateOp, ComplexRealOp, ComplexImagOp, CallOp,
VecExtractOp>(op))
ops.push_back(op);
});

Expand Down
33 changes: 33 additions & 0 deletions clang/test/CIR/Transforms/vector-extract-fold.cir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// RUN: cir-opt %s -cir-canonicalize -o - | FileCheck %s

!s32i = !cir.int<s, 32>

module {
cir.func @fold_extract_vector_op_test() {
%init = cir.alloca !s32i, !cir.ptr<!s32i>, ["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<!s32i x 4>
%index = cir.const #cir.int<1> : !s32i
%ele = cir.vec.extract %const_vec[%index : !s32i] : !cir.vector<!s32i x 4>
cir.store %ele, %init : !s32i, !cir.ptr<!s32i>
cir.return
}

// CHECK: %[[INIT:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["e", init]
// CHECK: %[[VALUE:.*]] = cir.const #cir.int<2> : !s32i
// CHECK: cir.store %[[VALUE]], %[[INIT]] : !s32i, !cir.ptr<!s32i>

cir.func @fold_extract_vector_op_index_out_of_bounds_test() {
%init = cir.alloca !s32i, !cir.ptr<!s32i>, ["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<!s32i x 4>
%index = cir.const #cir.int<9> : !s32i
%ele = cir.vec.extract %const_vec[%index : !s32i] : !cir.vector<!s32i x 4>
cir.store %ele, %init : !s32i, !cir.ptr<!s32i>
cir.return
}

// CHECK: %[[INIT:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["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<!s32i x 4>
// CHECK: %[[INDEX:.*]] = cir.const #cir.int<9> : !s32i
// CHECK: %[[ELE:.*]] = cir.vec.extract %[[CONST_VEC]][%[[INDEX]] : !s32i] : !cir.vector<!s32i x 4>
// CHECK: cir.store %[[ELE]], %[[INIT]] : !s32i, !cir.ptr<!s32i>
}
Loading