Skip to content

Commit de117f9

Browse files
terapines-osc-cirterapines-osc-cir
committed
Merge remote-tracking branch 'origin/main' into cir-switch
2 parents fbeb0a2 + 4f3e788 commit de117f9

File tree

13 files changed

+291
-26
lines changed

13 files changed

+291
-26
lines changed

‎clang/lib/CIR/CodeGen/CIRGenAtomic.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,9 @@ bool AtomicInfo::requiresMemSetZero(mlir::Type ty) const {
290290
case cir::TEK_Scalar:
291291
return !isFullSizeType(CGF.CGM, ty, AtomicSizeInBits);
292292
case cir::TEK_Complex:
293-
llvm_unreachable("NYI");
293+
return !isFullSizeType(CGF.CGM,
294+
mlir::cast<cir::ComplexType>(ty).getElementType(),
295+
AtomicSizeInBits / 2);
294296

295297
// Padding in structs has an undefined bit pattern. User beware.
296298
case cir::TEK_Aggregate:
@@ -1499,7 +1501,8 @@ void CIRGenFunction::emitAtomicInit(Expr *init, LValue dest) {
14991501
}
15001502

15011503
case cir::TEK_Complex: {
1502-
llvm_unreachable("NYI");
1504+
mlir::Value value = emitComplexExpr(init);
1505+
atomics.emitCopyIntoMemory(RValue::get(value));
15031506
return;
15041507
}
15051508

‎clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,18 +1053,7 @@ mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned BuiltinID,
10531053
unsigned numElts = vecTy.getSize();
10541054
auto eltTy = vecTy.getElementType();
10551055

1056-
assert(isSized(eltTy) && "Element type must be a sized type");
1057-
1058-
unsigned eltBitWidth =
1059-
llvm::TypeSwitch<mlir::Type, unsigned>(eltTy)
1060-
.Case<cir::IntType>([](auto intTy) { return intTy.getWidth(); })
1061-
.Case<cir::SingleType>([](auto) { return 32; })
1062-
.Case<cir::DoubleType>([](auto) { return 64; })
1063-
.Default([](auto) {
1064-
llvm_unreachable("NYI: Unsupported type");
1065-
return 0;
1066-
});
1067-
1056+
unsigned eltBitWidth = getTypeSizeInBits(eltTy).getFixedValue();
10681057
unsigned vecBitWidth = numElts * eltBitWidth;
10691058
unsigned numLanes = vecBitWidth / 128;
10701059
unsigned numLaneElts = numElts / numLanes;

‎clang/lib/CIR/CodeGen/CIRGenExprAgg.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ void AggExprEmitter::emitInitializationToLValue(Expr *E, LValue LV) {
790790

791791
switch (CGF.getEvaluationKind(type)) {
792792
case cir::TEK_Complex:
793-
llvm_unreachable("NYI");
793+
CGF.emitComplexExprIntoLValue(E, LV, /*isInit*/ true);
794794
return;
795795
case cir::TEK_Aggregate:
796796
CGF.emitAggExpr(

‎clang/lib/CIR/CodeGen/CIRGenExprCXX.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ RValue CIRGenFunction::emitCXXMemberOrOperatorMemberCallExpr(
302302
"Destructor shouldn't have explicit parameters");
303303
assert(ReturnValue.isNull() && "Destructor shouldn't have return value");
304304
if (useVirtualCall) {
305-
llvm_unreachable("NYI");
305+
CIRGenFunction *CGF = CGM.getCurrCIRGenFun();
306+
CGM.getCXXABI().emitVirtualDestructorCall(
307+
*CGF, dtor, Dtor_Complete, This.getAddress(),
308+
dyn_cast<CXXMemberCallExpr>(CE));
306309
} else {
307310
GlobalDecl globalDecl(dtor, Dtor_Complete);
308311
CIRGenCallee Callee;

‎clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,12 @@ class ComplexExprEmitter : public StmtVisitor<ComplexExprEmitter, mlir::Value> {
171171
mlir::Value VisitCXXDefaultArgExpr(CXXDefaultArgExpr *DAE) {
172172
llvm_unreachable("NYI");
173173
}
174+
174175
mlir::Value VisitCXXDefaultInitExpr(CXXDefaultInitExpr *DIE) {
175-
llvm_unreachable("NYI");
176+
CIRGenFunction::CXXDefaultInitExprScope Scope(CGF, DIE);
177+
return Visit(DIE->getExpr());
176178
}
179+
177180
mlir::Value VisitExprWithCleanups(ExprWithCleanups *E) {
178181
CIRGenFunction::RunCleanupsScope Scope(CGF);
179182
mlir::Value V = Visit(E->getSubExpr());

‎clang/lib/CIR/CodeGen/CIRGenFunction.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,6 +1842,13 @@ class CIRGenFunction : public CIRGenTypeCache {
18421842
mlir::Value emitBuiltinObjectSize(const Expr *E, unsigned Type,
18431843
cir::IntType ResType, mlir::Value EmittedE,
18441844
bool IsDynamic);
1845+
1846+
/// Get size of type in bits using SizedTypeInterface
1847+
llvm::TypeSize getTypeSizeInBits(mlir::Type Ty) const {
1848+
assert(cir::isSized(Ty) && "Type must implement SizedTypeInterface");
1849+
return CGM.getDataLayout().getTypeSizeInBits(Ty);
1850+
}
1851+
18451852
template <uint32_t N>
18461853
[[maybe_unused]] RValue
18471854
emitBuiltinWithOneOverloadedType(const CallExpr *E, llvm::StringRef Name) {

‎clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerTypes.cpp‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,37 @@ FuncType LowerTypes::getFunctionType(const LowerFunctionInfo &FI) {
111111
return FuncType::get(ArgTypes, resultType, FI.isVariadic());
112112
}
113113

114+
static void dumpType(mlir::Type t) {
115+
auto *interface =
116+
llvm::dyn_cast<mlir::OpAsmDialectInterface>(&t.getDialect());
117+
auto printType = [&](mlir::Type typeToPrint, bool ptrLevel = 0) {
118+
llvm::SmallString<256> buffer;
119+
llvm::raw_svector_ostream out(buffer);
120+
mlir::OpAsmDialectInterface::AliasResult r =
121+
interface->getAlias(typeToPrint, out);
122+
llvm::errs() << "Missing default ABI-specific for type: ";
123+
if (ptrLevel)
124+
llvm::errs() << ptrLevel << " pointer indirection to ";
125+
if (r == mlir::OpAsmDialectInterface::AliasResult::NoAlias) {
126+
llvm::errs() << typeToPrint << "\n";
127+
return;
128+
}
129+
llvm::errs() << out.str() << "\n";
130+
};
131+
132+
mlir::Type finalTy = t;
133+
int ptrInd = 0;
134+
auto ptrTy = llvm::dyn_cast<cir::PointerType>(t);
135+
while (ptrTy) {
136+
finalTy = ptrTy.getPointee();
137+
ptrInd++;
138+
ptrTy = llvm::dyn_cast<cir::PointerType>(finalTy);
139+
}
140+
printType(finalTy, ptrInd);
141+
}
142+
114143
/// Convert a CIR type to its ABI-specific default form.
115-
mlir::Type LowerTypes::convertType(mlir::Type T) {
144+
mlir::Type LowerTypes::convertType(mlir::Type t) {
116145
/// NOTE(cir): It the original codegen this method is used to get the default
117146
/// LLVM IR representation for a given AST type. When a the ABI-specific
118147
/// function info sets a nullptr for a return or argument type, the default
@@ -121,12 +150,13 @@ mlir::Type LowerTypes::convertType(mlir::Type T) {
121150
/// It's kept here for codegen parity's sake.
122151

123152
// Certain CIR types are already ABI-specific, so we just return them.
124-
if (mlir::isa<BoolType, IntType, SingleType, DoubleType>(T)) {
125-
return T;
153+
if (mlir::isa<BoolType, IntType, SingleType, DoubleType>(t)) {
154+
return t;
126155
}
127156

128-
llvm::outs() << "Missing default ABI-specific type for " << T << "\n";
157+
dumpType(t);
129158
cir_cconv_assert_or_abort(
130-
!cir::MissingFeatures::X86DefaultABITypeConvertion(), "NYI");
131-
return T;
159+
!cir::MissingFeatures::X86DefaultABITypeConvertion(),
160+
"TargetLowering convertType NYI");
161+
return t;
132162
}

‎clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,8 +1197,7 @@ mlir::LogicalResult CIRToLLVMVTTAddrPointOpLowering::matchAndRewrite(
11971197
}
11981198

11991199
offsets.push_back(adaptor.getOffset());
1200-
eltType = mlir::IntegerType::get(resultType.getContext(), 8,
1201-
mlir::IntegerType::Signless);
1200+
eltType = mlir::LLVM::LLVMPointerType::get(rewriter.getContext());
12021201
} else {
12031202
llvmAddr = getValueForVTableSymbol(op, rewriter, getTypeConverter(),
12041203
op.getNameAttr(), eltType);

‎clang/test/CIR/CodeGen/complex.cpp‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR
33
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -Wno-unused-value -fclangir -emit-llvm %s -o %t-cir.ll
44
// RUN: FileCheck --input-file=%t-cir.ll %s -check-prefix=LLVM
5+
// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-linux-gnu -Wno-unused-value -emit-llvm %s -o %t.ll
6+
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
57

68
void complex_functional_cast() {
79
using IntComplex = int _Complex;
@@ -184,3 +186,45 @@ void complex_comma_operator(int _Complex a, int _Complex b) {
184186
// LLVM: %[[RESULT:.*]] = alloca { i32, i32 }, i64 1, align 4
185187
// LLVM: %[[TMP_B:.*]] = load { i32, i32 }, ptr %[[COMPLEX_B]], align 4
186188
// LLVM: store { i32, i32 } %[[TMP_B]], ptr %[[RESULT]], align 4
189+
190+
void complex_cxx_default_init_expr() {
191+
struct FPComplexWrapper {
192+
float _Complex c{};
193+
};
194+
195+
FPComplexWrapper w{};
196+
}
197+
198+
// CIR: %[[W_ADDR:.*]] = cir.alloca !rec_FPComplexWrapper, !cir.ptr<!rec_FPComplexWrapper>, ["w", init]
199+
// CIR: %[[C_ADDR:.*]] = cir.get_member %[[W_ADDR]][0] {name = "c"} : !cir.ptr<!rec_FPComplexWrapper> -> !cir.ptr<!cir.complex<!cir.float>>
200+
// CIR: %[[CONST_COMPLEX:.*]] = cir.const #cir.complex<#cir.fp<0.000000e+00> : !cir.float, #cir.fp<0.000000e+00> : !cir.float> : !cir.complex<!cir.float>
201+
// CIR: cir.store{{.*}} %[[CONST_COMPLEX]], %[[C_ADDR]] : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>>
202+
203+
// LLVM: %[[W_ADDR:.*]] = alloca %struct.FPComplexWrapper, i64 1, align 4
204+
// LLVM: %[[C_ADDR:.*]] = getelementptr %struct.FPComplexWrapper, ptr %[[W_ADDR]], i32 0, i32 0
205+
// LLVM: store { float, float } zeroinitializer, ptr %[[C_ADDR]], align 4
206+
207+
// OGCG: %[[W_ADDR:.*]] = alloca %struct.Wrapper, align 4
208+
// OGCG: %[[C_ADDR:.*]] = getelementptr inbounds nuw %struct.FPComplexWrapper, ptr %[[W_ADDR]], i32 0, i32 0
209+
// OGCG: %[[C_REAL_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[C_ADDR]], i32 0, i32 0
210+
// OGCG: %[[C_IMAG_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[C_ADDR]], i32 0, i32 1
211+
// OGCG: store float 0.000000e+00, ptr %[[C_REAL_PTR]], align 4
212+
// OGCG: store float 0.000000e+00, ptr %[[C_IMAG_PTR]], align 4
213+
214+
void complex_init_atomic() {
215+
_Atomic(float _Complex) a;
216+
__c11_atomic_init(&a, {1.0f, 2.0f});
217+
}
218+
219+
// CIR: %[[A_ADDR:.*]] = cir.alloca !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>>, ["a"]
220+
// CIR: %[[CONST_COMPLEX:.*]] = cir.const #cir.complex<#cir.fp<1.000000e+00> : !cir.float, #cir.fp<2.000000e+00> : !cir.float> : !cir.complex<!cir.float>
221+
// CIR: cir.store{{.*}} %[[CONST_COMPLEX]], %[[A_ADDR]] : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>>
222+
223+
// LLVM: %[[A_ADDR:.*]] = alloca { float, float }, i64 1, align 8
224+
// LLVM: store { float, float } { float 1.000000e+00, float 2.000000e+00 }, ptr %[[A_ADDR]], align 8
225+
226+
// OGCG: %[[A_ADDR:.*]] = alloca { float, float }, align 8
227+
// OGCG: %[[A_REAL_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[A_ADDR]], i32 0, i32 0
228+
// OGCG: %[[A_IMAG_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[A_ADDR]], i32 0, i32 1
229+
// OGCG: store float 1.000000e+00, ptr %[[A_REAL_PTR]], align 8
230+
// OGCG: store float 2.000000e+00, ptr %[[A_IMAG_PTR]], align 4

‎clang/test/CIR/CodeGen/virtual-destructor-explicit-unqualified-call.cpp‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -emit-cir %s -o %t.cir
2+
// RUN: FileCheck --check-prefix=CIR --input-file=%t.cir %s
3+
4+
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -emit-llvm %s -o %t.cir
5+
// RUN: FileCheck --check-prefix=LLVM --input-file=%t.cir %s
6+
7+
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -emit-llvm %s -o %t.cir
8+
// RUN: FileCheck --check-prefix=OGCG --input-file=%t.cir %s
9+
10+
class A {
11+
virtual ~A();
12+
A B(A);
13+
};
14+
A A::B(A) {
15+
// CIR-LABEL: cir.func dso_local @_ZN1A1BES_(
16+
// CIR-SAME: %[[THIS_ARG:.*]]: !cir.ptr<!rec_A>
17+
// CIR-NEXT: %[[THIS_VAR:.*]] = cir.alloca !cir.ptr<!rec_A>, !cir.ptr<!cir.ptr<!rec_A>>
18+
// CIR: cir.store %[[THIS_ARG]], %[[THIS_VAR]] : !cir.ptr<!rec_A>, !cir.ptr<!cir.ptr<!rec_A>>
19+
// CIR: %[[THIS:.*]] = cir.load %[[THIS_VAR]] : !cir.ptr<!cir.ptr<!rec_A>>, !cir.ptr<!rec_A>
20+
// CIR-NEXT: %[[VPTR_PTR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_A> -> !cir.ptr<!cir.vptr>
21+
// CIR-NEXT: %[[VPTR:.*]] = cir.load align(8) %[[VPTR_PTR]] : !cir.ptr<!cir.vptr>, !cir.vptr
22+
// CIR-NEXT: %[[DTOR_PTR:.*]] = cir.vtable.get_virtual_fn_addr %[[VPTR]][0] : !cir.vptr -> !cir.ptr<!cir.ptr<!cir.func<(!cir.ptr<!rec_A>)>>>
23+
// CIR-NEXT: %[[DTOR:.*]] = cir.load align(8) %[[DTOR_PTR]] : !cir.ptr<!cir.ptr<!cir.func<(!cir.ptr<!rec_A>)>>>, !cir.ptr<!cir.func<(!cir.ptr<!rec_A>)>>
24+
// CIR-NEXT: cir.call %[[DTOR]](%[[THIS]]) : (!cir.ptr<!cir.func<(!cir.ptr<!rec_A>)>>, !cir.ptr<!rec_A>) -> ()
25+
// CIR-NEXT: cir.trap
26+
// CIR-NEXT: }
27+
28+
29+
// LLVM-LABEL: define dso_local %class.A @_ZN1A1BES_(
30+
// LLVM-SAME: ptr %[[THIS_ARG:[0-9]+]],
31+
// LLVM-NEXT: %[[THIS_VAR:.*]] = alloca ptr, i64 1, align 8
32+
// LLVM: store ptr %[[THIS_ARG]], ptr %[[THIS_VAR]], align 8
33+
// LLVM: %[[THIS:.*]] = load ptr, ptr %[[THIS_VAR]], align 8
34+
// LLVM-NEXT: %[[VTABLE_PTR:.*]] = load ptr, ptr %[[THIS]], align 8
35+
// LLVM-NEXT: %[[VIRT_DTOR_ADDR:.*]] = getelementptr inbounds ptr, ptr %[[VTABLE_PTR]], i32 0
36+
// LLVM-NEXT: %[[DTOR:.*]] = load ptr, ptr %[[VIRT_DTOR_ADDR]], align 8
37+
// LLVM-NEXT: call void %[[DTOR]](ptr %[[THIS]])
38+
// LLVM-NEXT: call void @llvm.trap()
39+
// LLVM-NEXT: unreachable
40+
// LLVM-NEXT: }
41+
42+
43+
// OGCG-LABEL: define dso_local void @_ZN1A1BES_(
44+
// OGCG-SAME: ptr {{.*}}%[[THIS_ARG:.*]],
45+
// OGCG: %[[VAL_0:.*]] = alloca ptr, align 8
46+
// OGCG-NEXT: %[[THIS_VAR:.*]] = alloca ptr, align 8
47+
// OGCG: store ptr %[[THIS_ARG]], ptr %[[THIS_VAR]], align 8
48+
// OGCG: %[[THIS:.*]] = load ptr, ptr %[[THIS_VAR]], align 8
49+
// OGCG-NEXT: %[[VTABLE:.*]] = load ptr, ptr %[[THIS]], align 8
50+
// OGCG-NEXT: %[[VIRT_DTOR_ADDR:.*]] = getelementptr inbounds ptr, ptr %[[VTABLE]], i64 0
51+
// OGCG-NEXT: %[[DTOR:.*]] = load ptr, ptr %[[VIRT_DTOR_ADDR]], align 8
52+
// OGCG-NEXT: call void %[[DTOR]](ptr noundef nonnull align 8 dereferenceable(8) %[[THIS]]) #2
53+
// OGCG-NEXT: call void @llvm.trap()
54+
// OGCG-NEXT: unreachable
55+
// OGCG-NEXT: }
56+
57+
this->~A();
58+
}

0 commit comments

Comments
 (0)