[CIR] Implement folder for VecShuffleOp #143260

AmrDeveloper · 2025-06-07T12:49:42Z

This change adds a folder for the VecShuffleOp

Issue #136487

llvmbot · 2025-06-07T12:50:16Z

@llvm/pr-subscribers-clangir

@llvm/pr-subscribers-clang

Author: Amr Hesham (AmrDeveloper)

Changes

This change adds a folder for the VecShuffleOp

Issue #136487

Full diff: https://github.com/llvm/llvm-project/pull/143260.diff

4 Files Affected:

(modified) clang/include/clang/CIR/Dialect/IR/CIROps.td (+2)
(modified) clang/lib/CIR/Dialect/IR/CIRDialect.cpp (+35-3)
(modified) clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp (+1-1)
(added) clang/test/CIR/Transforms/vector-shuffle-fold.cir (+39)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index 038a59b8ff4eb..568861cea9f92 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -2199,7 +2199,9 @@ def VecShuffleOp : CIR_Op<"vec.shuffle",
     `(` $vec1 `,` $vec2 `:` qualified(type($vec1)) `)` $indices `:`
      qualified(type($result)) attr-dict
   }];
+
   let hasVerifier = 1;
+  let hasFolder = 1;
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index bfd3a0a62a8e7..0eae0494eafd5 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -1580,9 +1580,42 @@ OpFoldResult cir::VecExtractOp::fold(FoldAdaptor adaptor) {
 }
 
 //===----------------------------------------------------------------------===//
-// VecShuffle
+// VecShuffleOp
 //===----------------------------------------------------------------------===//
 
+OpFoldResult cir::VecShuffleOp::fold(FoldAdaptor adaptor) {
+  mlir::Attribute vec1 = adaptor.getVec1();
+  mlir::Attribute vec2 = adaptor.getVec2();
+
+  if (!mlir::isa_and_nonnull<cir::ConstVectorAttr>(vec1) ||
+      !mlir::isa_and_nonnull<cir::ConstVectorAttr>(vec2)) {
+    return {};
+  }
+
+  auto vec1Attr = mlir::cast<cir::ConstVectorAttr>(vec1);
+  auto vec2Attr = mlir::cast<cir::ConstVectorAttr>(vec2);
+
+  mlir::ArrayAttr vec1Elts = vec1Attr.getElts();
+  mlir::ArrayAttr vec2Elts = vec2Attr.getElts();
+  mlir::ArrayAttr indicesElts = adaptor.getIndices();
+
+  SmallVector<mlir::Attribute, 16> elements;
+  elements.reserve(indicesElts.size());
+
+  uint64_t vec1Size = vec1Elts.size();
+  for (const auto &idxAttr : indicesElts.getAsRange<cir::IntAttr>()) {
+    uint64_t idxValue = idxAttr.getUInt();
+    if (idxValue < vec1Size) {
+      elements.push_back(vec1Elts[idxValue]);
+    } else {
+      elements.push_back(vec2Elts[idxValue - vec1Size]);
+    }
+  }
+
+  return cir::ConstVectorAttr::get(
+      getType(), mlir::ArrayAttr::get(getContext(), elements));
+}
+
 LogicalResult cir::VecShuffleOp::verify() {
   // The number of elements in the indices array must match the number of
   // elements in the result type.
@@ -1613,7 +1646,6 @@ OpFoldResult cir::VecShuffleDynamicOp::fold(FoldAdaptor adaptor) {
       mlir::isa_and_nonnull<cir::ConstVectorAttr>(indices)) {
     auto vecAttr = mlir::cast<cir::ConstVectorAttr>(vec);
     auto indicesAttr = mlir::cast<cir::ConstVectorAttr>(indices);
-    auto vecTy = mlir::cast<cir::VectorType>(vecAttr.getType());
 
     mlir::ArrayAttr vecElts = vecAttr.getElts();
     mlir::ArrayAttr indicesElts = indicesAttr.getElts();
@@ -1631,7 +1663,7 @@ OpFoldResult cir::VecShuffleDynamicOp::fold(FoldAdaptor adaptor) {
     }
 
     return cir::ConstVectorAttr::get(
-        vecTy, mlir::ArrayAttr::get(getContext(), elements));
+        getType(), mlir::ArrayAttr::get(getContext(), elements));
   }
 
   return {};
diff --git a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
index 33881c69eec5f..29f9942638964 100644
--- a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
@@ -142,7 +142,7 @@ void CIRCanonicalizePass::runOnOperation() {
     // Many operations are here to perform a manual `fold` in
     // applyOpPatternsGreedily.
     if (isa<BrOp, BrCondOp, CastOp, ScopeOp, SwitchOp, SelectOp, UnaryOp,
-            VecExtractOp, VecShuffleDynamicOp, VecTernaryOp>(op))
+            VecExtractOp, VecShuffleOp, VecShuffleDynamicOp, VecTernaryOp>(op))
       ops.push_back(op);
   });
 
diff --git a/clang/test/CIR/Transforms/vector-shuffle-fold.cir b/clang/test/CIR/Transforms/vector-shuffle-fold.cir
new file mode 100644
index 0000000000000..a6b43b6f2951d
--- /dev/null
+++ b/clang/test/CIR/Transforms/vector-shuffle-fold.cir
@@ -0,0 +1,39 @@
+// RUN: cir-opt %s -cir-canonicalize -o - -split-input-file | FileCheck %s
+
+!s32i = !cir.int<s, 32>
+!s64i = !cir.int<s, 64>
+
+module  {
+  cir.func @fold_shuffle_vector_op_test() -> !cir.vector<4 x !s32i> {
+    %vec_1 = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<3> : !s32i, #cir.int<5> : !s32i, #cir.int<7> : !s32i]> : !cir.vector<4 x !s32i>
+    %vec_2 = cir.const #cir.const_vector<[#cir.int<2> : !s32i, #cir.int<4> : !s32i, #cir.int<6> : !s32i, #cir.int<8> : !s32i]> : !cir.vector<4 x !s32i>
+    %new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector<4 x !s32i>) [#cir.int<0> : !s64i, #cir.int<4> : !s64i,
+      #cir.int<1> : !s64i, #cir.int<5> : !s64i] : !cir.vector<4 x !s32i>
+    cir.return %new_vec : !cir.vector<4 x !s32i>
+  }
+
+  // CHECK: cir.func @fold_shuffle_vector_op_test() -> !cir.vector<4 x !s32i> {
+  // CHECK-NEXT: %[[RES:.*]] = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<3> : !s32i,
+  // CHECK-SAME: #cir.int<4> : !s32i]> : !cir.vector<4 x !s32i>
+  // CHECK-NEXT: cir.return %[[RES]] : !cir.vector<4 x !s32i>
+}
+
+// -----
+
+!s32i = !cir.int<s, 32>
+!s64i = !cir.int<s, 64>
+
+module  {
+  cir.func @fold_shuffle_vector_op_test() -> !cir.vector<6 x !s32i> {
+    %vec_1 = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<3> : !s32i, #cir.int<5> : !s32i, #cir.int<7> : !s32i]> : !cir.vector<4 x !s32i>
+    %vec_2 = cir.const #cir.const_vector<[#cir.int<2> : !s32i, #cir.int<4> : !s32i, #cir.int<6> : !s32i, #cir.int<8> : !s32i]> : !cir.vector<4 x !s32i>
+    %new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector<4 x !s32i>) [#cir.int<0> : !s64i, #cir.int<4> : !s64i,
+      #cir.int<1> : !s64i, #cir.int<5> : !s64i, #cir.int<2> : !s64i, #cir.int<6> : !s64i] : !cir.vector<6 x !s32i>
+    cir.return %new_vec : !cir.vector<6 x !s32i>
+  }
+
+  // CHECK: cir.func @fold_shuffle_vector_op_test() -> !cir.vector<6 x !s32i> {
+  // CHECK-NEXT: %[[RES:.*]] = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<3> : !s32i,
+  // CHECK-SAME: #cir.int<4> : !s32i, #cir.int<5> : !s32i, #cir.int<6> : !s32i]> : !cir.vector<6 x !s32i>
+  // CHECK-NEXT: cir.return %[[RES]] : !cir.vector<6 x !s32i>
+}

xlauko · 2025-06-08T19:28:17Z

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

+  mlir::Attribute vec1 = adaptor.getVec1();
+  mlir::Attribute vec2 = adaptor.getVec2();
+
+  if (!mlir::isa_and_nonnull<cir::ConstVectorAttr>(vec1) ||
+      !mlir::isa_and_nonnull<cir::ConstVectorAttr>(vec2)) {
+    return {};
+  }
+
+  auto vec1Attr = mlir::cast<cir::ConstVectorAttr>(vec1);
+  auto vec2Attr = mlir::cast<cir::ConstVectorAttr>(vec2);


Suggested change

mlir::Attribute vec1 = adaptor.getVec1();

mlir::Attribute vec2 = adaptor.getVec2();

if (!mlir::isa_and_nonnull<cir::ConstVectorAttr>(vec1) ||

!mlir::isa_and_nonnull<cir::ConstVectorAttr>(vec2)) {

return {};

}

auto vec1Attr = mlir::cast<cir::ConstVectorAttr>(vec1);

auto vec2Attr = mlir::cast<cir::ConstVectorAttr>(vec2);

auto vec1Attr = mlir::dyn_cast_if_present<cir::ConstVectorAttr>(adaptor.getVec1());

auto vec2Attr = mlir::dyn_cast_if_present<cir::ConstVectorAttr>(adaptor.getVec2()));

if (!vec1Attr || !vec2Attr)

return {};

bcardosolopes

Thanks for this folder, one nit and good to go

bcardosolopes · 2025-06-09T13:30:20Z

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

+    if (idxValue < vec1Size) {
+      elements.push_back(vec1Elts[idxValue]);
+    } else {
+      elements.push_back(vec2Elts[idxValue - vec1Size]);


elements.push_back(idxValue < vec1Size ? vec1Elts[idxValue] : vec2Elts[idxValue - vec1Size])

andykaylor

lgtm

xlauko

lgtm

[CIR] Implement folder for VecShuffleOp

14ffd45

AmrDeveloper requested review from xlauko, mmha and andykaylor June 7, 2025 12:49

AmrDeveloper requested review from lanza and bcardosolopes as code owners June 7, 2025 12:49

llvmbot added clang Clang issues not falling into any other category ClangIR Anything related to the ClangIR project labels Jun 7, 2025

Add support for -1 index in the folder

f9fad4a

xlauko reviewed Jun 8, 2025

View reviewed changes

Address code review comment

6550181

bcardosolopes approved these changes Jun 9, 2025

View reviewed changes

Address code review comment

b1ce672

andykaylor approved these changes Jun 9, 2025

View reviewed changes

xlauko approved these changes Jun 10, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[CIR] Implement folder for VecShuffleOp #143260

[CIR] Implement folder for VecShuffleOp #143260

AmrDeveloper commented Jun 7, 2025

Uh oh!

llvmbot commented Jun 7, 2025 •

edited

Loading

Uh oh!

xlauko Jun 8, 2025

Uh oh!

bcardosolopes left a comment

Uh oh!

bcardosolopes Jun 9, 2025

Uh oh!

andykaylor left a comment

Uh oh!

xlauko left a comment

Uh oh!

Uh oh!

[CIR] Implement folder for VecShuffleOp #143260

Are you sure you want to change the base?

[CIR] Implement folder for VecShuffleOp #143260

Conversation

AmrDeveloper commented Jun 7, 2025

Uh oh!

llvmbot commented Jun 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xlauko Jun 8, 2025

Choose a reason for hiding this comment

Uh oh!

bcardosolopes left a comment

Choose a reason for hiding this comment

Uh oh!

bcardosolopes Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

andykaylor left a comment

Choose a reason for hiding this comment

Uh oh!

xlauko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

llvmbot commented Jun 7, 2025 •

edited

Loading