https://github.com/AmrDeveloper updated
https://github.com/llvm/llvm-project/pull/142288
>From 758e921e4811697269a317b693ef40e1dcf46d61 Mon Sep 17 00:00:00 2001
From: AmrDeveloper <am...@programmer.net>
Date: Sat, 31 May 2025 19:53:56 +0200
Subject: [PATCH 1/6] [CIR] Upstream ShuffleOp for VectorType
---
clang/include/clang/CIR/Dialect/IR/CIROps.td | 44 +++++++++++++++++++
clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp | 21 +++++++--
clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 23 ++++++++++
.../CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 18 ++++++++
.../CIR/Lowering/DirectToLLVM/LowerToLLVM.h | 10 +++++
clang/test/CIR/CodeGen/vector-ext.cpp | 25 +++++++++++
clang/test/CIR/CodeGen/vector.cpp | 25 +++++++++++
clang/test/CIR/IR/invalid-vector.cir | 38 ++++++++++++++++
8 files changed, 201 insertions(+), 3 deletions(-)
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td
b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index bd847731193ab..b39f819604dd8 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -2155,6 +2155,50 @@ def VecCmpOp : CIR_Op<"vec.cmp", [Pure,
SameTypeOperands]> {
}];
}
+//===----------------------------------------------------------------------===//
+// VecShuffleOp
+//===----------------------------------------------------------------------===//
+
+// TODO: Create an interface that both VecShuffleOp and VecShuffleDynamicOp
+// implement. This could be useful for passes that don't care how the vector
+// shuffle was specified.
+
+def VecShuffleOp : CIR_Op<"vec.shuffle",
+ [Pure, AllTypesMatch<["vec1", "vec2"]>]> {
+ let summary = "Combine two vectors using indices passed as constant
integers";
+ let description = [{
+ The `cir.vec.shuffle` operation implements the documented form of Clang's
+ __builtin_shufflevector, where the indices of the shuffled result are
+ integer constants.
+
+ The two input vectors, which must have the same type, are concatenated.
+ Each of the integer constant arguments is interpreted as an index into that
+ concatenated vector, with a value of -1 meaning that the result value
+ doesn't matter. The result vector, which must have the same element type as
+ the input vectors and the same number of elements as the list of integer
+ constant indices, is constructed by taking the elements at the given
+ indices from the concatenated vector.
+
+ ```mlir
+ %new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector<2 x !s32i>)
+ [#cir.int<3> : !s64i, #cir.int<1> : !s64i] : !cir.vector<2 x !s32i>
+ ```
+ }];
+
+ let arguments = (ins
+ CIR_VectorType:$vec1,
+ CIR_VectorType:$vec2,
+ TypedArrayAttrBase<IntAttr, "Integer array attribute">:$indices
+ );
+
+ let results = (outs CIR_VectorType:$result);
+ let assemblyFormat = [{
+ `(` $vec1 `,` $vec2 `:` qualified(type($vec1)) `)` $indices `:`
+ qualified(type($result)) attr-dict
+ }];
+ let hasVerifier = 1;
+}
+
//===----------------------------------------------------------------------===//
// VecShuffleDynamicOp
//===----------------------------------------------------------------------===//
diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
index a7899fccc47fb..899622d5df74d 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
@@ -189,9 +189,24 @@ class ScalarExprEmitter : public
StmtVisitor<ScalarExprEmitter, mlir::Value> {
cgf.getLoc(e->getSourceRange()), inputVec, indexVec);
}
- cgf.getCIRGenModule().errorNYI(e->getSourceRange(),
- "ShuffleVectorExpr with indices");
- return {};
+ mlir::Value vec1 = Visit(e->getExpr(0));
+ mlir::Value vec2 = Visit(e->getExpr(1));
+
+ // The documented form of __builtin_shufflevector, where the indices are
+ // a variable number of integer constants. The constants will be stored
+ // in an ArrayAttr.
+ SmallVector<mlir::Attribute, 8> indices;
+ for (unsigned i = 2; i < e->getNumSubExprs(); ++i) {
+ indices.push_back(
+ cir::IntAttr::get(cgf.builder.getSInt64Ty(),
+ e->getExpr(i)
+ ->EvaluateKnownConstInt(cgf.getContext())
+ .getSExtValue()));
+ }
+
+ return cgf.builder.create<cir::VecShuffleOp>(
+ cgf.getLoc(e->getSourceRange()), cgf.convertType(e->getType()), vec1,
+ vec2, cgf.builder.getArrayAttr(indices));
}
mlir::Value VisitConvertVectorExpr(ConvertVectorExpr *e) {
diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index d7999f59bd021..7f09830576181 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -1579,6 +1579,29 @@ OpFoldResult cir::VecExtractOp::fold(FoldAdaptor
adaptor) {
return elements[index];
}
+//===----------------------------------------------------------------------===//
+// VecShuffle
+//===----------------------------------------------------------------------===//
+
+LogicalResult cir::VecShuffleOp::verify() {
+ // The number of elements in the indices array must match the number of
+ // elements in the result type.
+ if (getIndices().size() != getResult().getType().getSize()) {
+ return emitOpError() << ": the number of elements in " << getIndices()
+ << " and " << getResult().getType() << " don't match";
+ }
+
+ // The element types of the two input vectors and of the result type must
+ // match.
+ if (getVec1().getType().getElementType() !=
+ getResult().getType().getElementType()) {
+ return emitOpError() << ": element types of " << getVec1().getType()
+ << " and " << getResult().getType() << " don't match";
+ }
+
+ return success();
+}
+
//===----------------------------------------------------------------------===//
// VecShuffleDynamicOp
//===----------------------------------------------------------------------===//
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index 977c8912c1d11..31ff2072bc80c 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -1770,6 +1770,7 @@ void ConvertCIRToLLVMPass::runOnOperation() {
CIRToLLVMVecExtractOpLowering,
CIRToLLVMVecInsertOpLowering,
CIRToLLVMVecCmpOpLowering,
+ CIRToLLVMVecShuffleOpLowering,
CIRToLLVMVecShuffleDynamicOpLowering,
CIRToLLVMVecTernaryOpLowering
// clang-format on
@@ -1922,6 +1923,23 @@ mlir::LogicalResult
CIRToLLVMVecCmpOpLowering::matchAndRewrite(
return mlir::success();
}
+mlir::LogicalResult CIRToLLVMVecShuffleOpLowering::matchAndRewrite(
+ cir::VecShuffleOp op, OpAdaptor adaptor,
+ mlir::ConversionPatternRewriter &rewriter) const {
+ // LLVM::ShuffleVectorOp takes an ArrayRef of int for the list of indices.
+ // Convert the ClangIR ArrayAttr of IntAttr constants into a
+ // SmallVector<int>.
+ SmallVector<int, 8> indices;
+ std::transform(
+ op.getIndices().begin(), op.getIndices().end(),
+ std::back_inserter(indices), [](mlir::Attribute intAttr) {
+ return mlir::cast<cir::IntAttr>(intAttr).getValue().getSExtValue();
+ });
+ rewriter.replaceOpWithNewOp<mlir::LLVM::ShuffleVectorOp>(
+ op, adaptor.getVec1(), adaptor.getVec2(), indices);
+ return mlir::success();
+}
+
mlir::LogicalResult CIRToLLVMVecShuffleDynamicOpLowering::matchAndRewrite(
cir::VecShuffleDynamicOp op, OpAdaptor adaptor,
mlir::ConversionPatternRewriter &rewriter) const {
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.h
b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.h
index d1efa4e181a07..ad2334bd531d7 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.h
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.h
@@ -357,6 +357,16 @@ class CIRToLLVMVecCmpOpLowering
mlir::ConversionPatternRewriter &) const override;
};
+class CIRToLLVMVecShuffleOpLowering
+ : public mlir::OpConversionPattern<cir::VecShuffleOp> {
+public:
+ using mlir::OpConversionPattern<cir::VecShuffleOp>::OpConversionPattern;
+
+ mlir::LogicalResult
+ matchAndRewrite(cir::VecShuffleOp op, OpAdaptor,
+ mlir::ConversionPatternRewriter &) const override;
+};
+
class CIRToLLVMVecShuffleDynamicOpLowering
: public mlir::OpConversionPattern<cir::VecShuffleDynamicOp> {
public:
diff --git a/clang/test/CIR/CodeGen/vector-ext.cpp
b/clang/test/CIR/CodeGen/vector-ext.cpp
index 8a0479fc1d088..aa836c2e70a12 100644
--- a/clang/test/CIR/CodeGen/vector-ext.cpp
+++ b/clang/test/CIR/CodeGen/vector-ext.cpp
@@ -1091,3 +1091,28 @@ void foo17() {
// OGCG: %[[VEC_A:.*]] = alloca <2 x double>, align 16
// OGCG: %[[TMP:.*]] = load <2 x double>, ptr %[[VEC_A]], align 16
// OGCG: %[[RES:.*]]= fptoui <2 x double> %[[TMP]] to <2 x i16>
+
+void foo19() {
+ vi4 a;
+ vi4 b;
+ vi4 u = __builtin_shufflevector(a, b, 7, 5, 3, 1);
+}
+
+// CIR: %[[VEC_A:.*]] = cir.alloca !cir.vector<4 x !s32i>,
!cir.ptr<!cir.vector<4 x !s32i>>, ["a"]
+// CIR: %[[VEC_B:.*]] = cir.alloca !cir.vector<4 x !s32i>,
!cir.ptr<!cir.vector<4 x !s32i>>, ["b"]
+// CIR: %[[TMP_A:.*]] = cir.load{{.*}} %[[VEC_A]] : !cir.ptr<!cir.vector<4 x
!s32i>>, !cir.vector<4 x !s32i>
+// CIR: %[[TMP_B:.*]] = cir.load{{.*}} %[[VEC_B]] : !cir.ptr<!cir.vector<4 x
!s32i>>, !cir.vector<4 x !s32i>
+// CIR: %[[SHUF:.*]] = cir.vec.shuffle(%[[TMP_A]], %[[TMP_B]] : !cir.vector<4
x !s32i>) [#cir.int<7> :
+// CIR-SAME: !s64i, #cir.int<5> : !s64i, #cir.int<3> : !s64i, #cir.int<1> :
!s64i] : !cir.vector<4 x !s32i>
+
+// LLVM: %[[VEC_A:.*]] = alloca <4 x i32>, i64 1, align 16
+// LLVM: %[[VEC_B:.*]] = alloca <4 x i32>, i64 1, align 16
+// LLVM: %[[TMP_A:.*]] = load <4 x i32>, ptr %[[VEC_A]], align 16
+// LLVM: %[[TMP_B:.*]] = load <4 x i32>, ptr %[[VEC_B]], align 16
+// LLVM: %[[SHUF:.*]] = shufflevector <4 x i32> %[[TMP_A]], <4 x i32>
%[[TMP_B]], <4 x i32> <i32 7, i32 5, i32 3, i32 1>
+
+// OGCG: %[[VEC_A:.*]] = alloca <4 x i32>, align 16
+// OGCG: %[[VEC_B:.*]] = alloca <4 x i32>, align 16
+// OGCG: %[[TMP_A:.*]] = load <4 x i32>, ptr %[[VEC_A]], align 16
+// OGCG: %[[TMP_B:.*]] = load <4 x i32>, ptr %[[VEC_B]], align 16
+// OGCG: %[[SHUF:.*]] = shufflevector <4 x i32> %[[TMP_A]], <4 x i32>
%[[TMP_B]], <4 x i32> <i32 7, i32 5, i32 3, i32 1>
diff --git a/clang/test/CIR/CodeGen/vector.cpp
b/clang/test/CIR/CodeGen/vector.cpp
index 586438f1fed2e..f53264c584cc0 100644
--- a/clang/test/CIR/CodeGen/vector.cpp
+++ b/clang/test/CIR/CodeGen/vector.cpp
@@ -1071,6 +1071,31 @@ void foo17() {
// OGCG: %[[TMP:.*]] = load <2 x double>, ptr %[[VEC_A]], align 16
// OGCG: %[[RES:.*]]= fptoui <2 x double> %[[TMP]] to <2 x i16>
+void foo19() {
+ vi4 a;
+ vi4 b;
+ vi4 u = __builtin_shufflevector(a, b, 7, 5, 3, 1);
+}
+
+// CIR: %[[VEC_A:.*]] = cir.alloca !cir.vector<4 x !s32i>,
!cir.ptr<!cir.vector<4 x !s32i>>, ["a"]
+// CIR: %[[VEC_B:.*]] = cir.alloca !cir.vector<4 x !s32i>,
!cir.ptr<!cir.vector<4 x !s32i>>, ["b"]
+// CIR: %[[TMP_A:.*]] = cir.load{{.*}} %[[VEC_A]] : !cir.ptr<!cir.vector<4 x
!s32i>>, !cir.vector<4 x !s32i>
+// CIR: %[[TMP_B:.*]] = cir.load{{.*}} %[[VEC_B]] : !cir.ptr<!cir.vector<4 x
!s32i>>, !cir.vector<4 x !s32i>
+// CIR: %[[SHUF:.*]] = cir.vec.shuffle(%[[TMP_A]], %[[TMP_B]] : !cir.vector<4
x !s32i>) [#cir.int<7> :
+// CIR-SAME: !s64i, #cir.int<5> : !s64i, #cir.int<3> : !s64i, #cir.int<1> :
!s64i] : !cir.vector<4 x !s32i>
+
+// LLVM: %[[VEC_A:.*]] = alloca <4 x i32>, i64 1, align 16
+// LLVM: %[[VEC_B:.*]] = alloca <4 x i32>, i64 1, align 16
+// LLVM: %[[TMP_A:.*]] = load <4 x i32>, ptr %[[VEC_A]], align 16
+// LLVM: %[[TMP_B:.*]] = load <4 x i32>, ptr %[[VEC_B]], align 16
+// LLVM: %[[SHUF:.*]] = shufflevector <4 x i32> %[[TMP_A]], <4 x i32>
%[[TMP_B]], <4 x i32> <i32 7, i32 5, i32 3, i32 1>
+
+// OGCG: %[[VEC_A:.*]] = alloca <4 x i32>, align 16
+// OGCG: %[[VEC_B:.*]] = alloca <4 x i32>, align 16
+// OGCG: %[[TMP_A:.*]] = load <4 x i32>, ptr %[[VEC_A]], align 16
+// OGCG: %[[TMP_B:.*]] = load <4 x i32>, ptr %[[VEC_B]], align 16
+// OGCG: %[[SHUF:.*]] = shufflevector <4 x i32> %[[TMP_A]], <4 x i32>
%[[TMP_B]], <4 x i32> <i32 7, i32 5, i32 3, i32 1>
+
void foo20() {
vi4 a;
vi4 b;
diff --git a/clang/test/CIR/IR/invalid-vector.cir
b/clang/test/CIR/IR/invalid-vector.cir
index 72676a4718e19..98e1109df84f9 100644
--- a/clang/test/CIR/IR/invalid-vector.cir
+++ b/clang/test/CIR/IR/invalid-vector.cir
@@ -8,3 +8,41 @@ module {
cir.global external @vec_b = #cir.zero : !cir.vector<4 x !cir.array<!s32i x
10>>
}
+
+// -----
+
+!s32i = !cir.int<s, 32>
+!s64i = !cir.int<s, 64>
+
+module {
+ cir.func @invalid_vector_shuffle() {
+ %1 = cir.const #cir.int<1> : !s32i
+ %2 = cir.const #cir.int<2> : !s32i
+ %3 = cir.const #cir.int<3> : !s32i
+ %4 = cir.const #cir.int<4> : !s32i
+ %vec_1 = cir.vec.create(%1, %2, %3, %4 : !s32i, !s32i, !s32i, !s32i) :
!cir.vector<4 x !s32i>
+ %vec_2 = cir.vec.create(%1, %2, %3, %4 : !s32i, !s32i, !s32i, !s32i) :
!cir.vector<4 x !s32i>
+ // expected-error @below {{element types of '!cir.vector<4 x !cir.int<s,
32>>' and '!cir.vector<4 x !cir.int<s, 64>>' don't match}}
+ %new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector<4 x !s32i>)
[#cir.int<7> : !s64i, #cir.int<5> : !s64i, #cir.int<3> : !s64i, #cir.int<1> :
!s64i] : !cir.vector<4 x !s64i>
+ cir.return
+ }
+}
+
+// -----
+
+!s32i = !cir.int<s, 32>
+!s64i = !cir.int<s, 64>
+
+module {
+ cir.func @invalid_vector_shuffle() {
+ %1 = cir.const #cir.int<1> : !s32i
+ %2 = cir.const #cir.int<2> : !s32i
+ %3 = cir.const #cir.int<3> : !s32i
+ %4 = cir.const #cir.int<4> : !s32i
+ %vec_1 = cir.vec.create(%1, %2, %3, %4 : !s32i, !s32i, !s32i, !s32i) :
!cir.vector<4 x !s32i>
+ %vec_2 = cir.vec.create(%1, %2, %3, %4 : !s32i, !s32i, !s32i, !s32i) :
!cir.vector<4 x !s32i>
+ // expected-error @below {{the number of elements in [#cir.int<7> :
!cir.int<s, 64>, #cir.int<5> : !cir.int<s, 64>, #cir.int<3> : !cir.int<s, 64>]
and '!cir.vector<4 x !cir.int<s, 64>>' don't match}}
+ %new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector<4 x !s32i>)
[#cir.int<7> : !s64i, #cir.int<5> : !s64i, #cir.int<3> : !s64i] : !cir.vector<4
x !s64i>
+ cir.return
+ }
+}
>From 7521f1a3341d315b4db18b0011c66d7ef142e937 Mon Sep 17 00:00:00 2001
From: AmrDeveloper <am...@programmer.net>
Date: Sun, 1 Jun 2025 19:34:24 +0200
Subject: [PATCH 2/6] Add CIR_IntArrayAttr and update Op description
---
.../include/clang/CIR/Dialect/IR/CIRAttrConstraints.td | 10 ++++++++--
clang/include/clang/CIR/Dialect/IR/CIROps.td | 7 +++++--
clang/include/clang/CIR/Dialect/IR/CMakeLists.txt | 6 ++++++
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
b/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
index 382117938b2fe..a8c81dbd71a09 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
@@ -1,4 +1,3 @@
-
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
@@ -39,4 +38,11 @@ def CIR_AnyIntOrFloatAttr : AnyAttrOf<[CIR_AnyIntAttr,
CIR_AnyFPAttr],
string cppType = "::mlir::TypedAttr";
}
-#endif // CLANG_CIR_DIALECT_IR_CIRATTRCONSTRAINTS_TD
+//===----------------------------------------------------------------------===//
+// ArrayAttr constraints
+//===----------------------------------------------------------------------===//
+
+def CIR_IntArrayAttr : TypedArrayAttrBase<CIR_AnyIntAttr,
+ "integer array attribute">;
+
+#endif // CLANG_CIR_DIALECT_IR_CIRATTRCONSTRAINTS_TD
\ No newline at end of file
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td
b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index b39f819604dd8..01fe3c775966d 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -17,6 +17,7 @@
include "clang/CIR/Dialect/IR/CIRDialect.td"
include "clang/CIR/Dialect/IR/CIRTypes.td"
include "clang/CIR/Dialect/IR/CIRAttrs.td"
+include "clang/CIR/Dialect/IR/CIRAttrConstraints.td"
include "clang/CIR/Interfaces/CIROpInterfaces.td"
include "clang/CIR/Interfaces/CIRLoopOpInterface.td"
@@ -2177,7 +2178,9 @@ def VecShuffleOp : CIR_Op<"vec.shuffle",
doesn't matter. The result vector, which must have the same element type as
the input vectors and the same number of elements as the list of integer
constant indices, is constructed by taking the elements at the given
- indices from the concatenated vector.
+ indices from the concatenated vector. The size of the result vector does
+ not have to match the size of the individual input vectors or of the
+ concatenated vector.
```mlir
%new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector<2 x !s32i>)
@@ -2188,7 +2191,7 @@ def VecShuffleOp : CIR_Op<"vec.shuffle",
let arguments = (ins
CIR_VectorType:$vec1,
CIR_VectorType:$vec2,
- TypedArrayAttrBase<IntAttr, "Integer array attribute">:$indices
+ CIR_IntArrayAttr:$indices
);
let results = (outs CIR_VectorType:$result);
diff --git a/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
b/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
index 6e7f3da4add3e..436c9aa85635c 100644
--- a/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
+++ b/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
@@ -25,3 +25,9 @@ mlir_tablegen(CIRTypeConstraints.h.inc
-gen-type-constraint-decls)
mlir_tablegen(CIRTypeConstraints.cpp.inc -gen-type-constraint-defs)
add_public_tablegen_target(MLIRCIRTypeConstraintsIncGen)
add_dependencies(mlir-headers MLIRCIRTypeConstraintsIncGen)
+
+set(LLVM_TARGET_DEFINITIONS CIRAttrConstraints.td)
+mlir_tablegen(CIRAttrConstraints.h.inc -gen-type-constraint-decls)
+mlir_tablegen(CIRAttrConstraints.cpp.inc -gen-type-constraint-defs)
+add_public_tablegen_target(MLIRCIRAttrConstraintsIncGen)
+add_dependencies(mlir-headers MLIRCIRAttrConstraintsIncGen)
>From 27e8333b25b777cfeb81eec9bc6df7848c8a5f1d Mon Sep 17 00:00:00 2001
From: AmrDeveloper <am...@programmer.net>
Date: Sun, 1 Jun 2025 20:43:50 +0200
Subject: [PATCH 3/6] Address code review comments
---
clang/include/clang/CIR/Dialect/IR/CIROps.td | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td
b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index 01fe3c775966d..8b584e81b8a2b 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -2169,7 +2169,7 @@ def VecShuffleOp : CIR_Op<"vec.shuffle",
let summary = "Combine two vectors using indices passed as constant
integers";
let description = [{
The `cir.vec.shuffle` operation implements the documented form of Clang's
- __builtin_shufflevector, where the indices of the shuffled result are
+ `__builtin_shufflevector`, where the indices of the shuffled result are
integer constants.
The two input vectors, which must have the same type, are concatenated.
>From f5993086457759b87185f7b37c4aa224f1784987 Mon Sep 17 00:00:00 2001
From: AmrDeveloper <am...@programmer.net>
Date: Sun, 1 Jun 2025 21:46:06 +0200
Subject: [PATCH 4/6] Update IntArray Attr Constraints
---
clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
b/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
index a8c81dbd71a09..9947fc602cfb2 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
@@ -15,16 +15,11 @@
include "mlir/IR/CommonAttrConstraints.td"
-class CIR_IsAttrPred<code attr> : CPred<"::mlir::isa<" # attr # ">($_self)">;
-
-class CIR_AttrConstraint<code attr, string summary = "">
- : Attr<CIR_IsAttrPred<attr>, summary>;
-
//===----------------------------------------------------------------------===//
// IntAttr constraints
//===----------------------------------------------------------------------===//
-def CIR_AnyIntAttr : CIR_AttrConstraint<"::cir::IntAttr", "integer attribute">;
+def CIR_AnyIntAttr : Attr<CPred<"mlir::isa<cir::IntAttr>($_self)">, "integer
attribute">;
//===----------------------------------------------------------------------===//
// FPAttr constraints
>From f7d1d6c7393e960de69a4ca5e7b05a93285bf71b Mon Sep 17 00:00:00 2001
From: AmrDeveloper <am...@programmer.net>
Date: Tue, 3 Jun 2025 20:03:26 +0200
Subject: [PATCH 5/6] Update Attr Constraint
---
clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
b/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
index 9947fc602cfb2..a8c81dbd71a09 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td
@@ -15,11 +15,16 @@
include "mlir/IR/CommonAttrConstraints.td"
+class CIR_IsAttrPred<code attr> : CPred<"::mlir::isa<" # attr # ">($_self)">;
+
+class CIR_AttrConstraint<code attr, string summary = "">
+ : Attr<CIR_IsAttrPred<attr>, summary>;
+
//===----------------------------------------------------------------------===//
// IntAttr constraints
//===----------------------------------------------------------------------===//
-def CIR_AnyIntAttr : Attr<CPred<"mlir::isa<cir::IntAttr>($_self)">, "integer
attribute">;
+def CIR_AnyIntAttr : CIR_AttrConstraint<"::cir::IntAttr", "integer attribute">;
//===----------------------------------------------------------------------===//
// FPAttr constraints
>From 421b90e78ddfcd87960de36c9f6e9112a0b01896 Mon Sep 17 00:00:00 2001
From: AmrDeveloper <am...@programmer.net>
Date: Thu, 5 Jun 2025 11:37:13 +0200
Subject: [PATCH 6/6] Remove unneeded Cmake config
---
clang/include/clang/CIR/Dialect/IR/CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)
diff --git a/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
b/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
index 436c9aa85635c..6e7f3da4add3e 100644
--- a/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
+++ b/clang/include/clang/CIR/Dialect/IR/CMakeLists.txt
@@ -25,9 +25,3 @@ mlir_tablegen(CIRTypeConstraints.h.inc
-gen-type-constraint-decls)
mlir_tablegen(CIRTypeConstraints.cpp.inc -gen-type-constraint-defs)
add_public_tablegen_target(MLIRCIRTypeConstraintsIncGen)
add_dependencies(mlir-headers MLIRCIRTypeConstraintsIncGen)
-
-set(LLVM_TARGET_DEFINITIONS CIRAttrConstraints.td)
-mlir_tablegen(CIRAttrConstraints.h.inc -gen-type-constraint-decls)
-mlir_tablegen(CIRAttrConstraints.cpp.inc -gen-type-constraint-defs)
-add_public_tablegen_target(MLIRCIRAttrConstraintsIncGen)
-add_dependencies(mlir-headers MLIRCIRAttrConstraintsIncGen)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
