Author: Arseniy Obolenskiy Date: 2026-10-24T08:58:08+02:00 New Revision: 73c0f4b2377378957b2134e283b9c631dfcb90d5
URL: https://github.com/llvm/llvm-project/commit/73c0f4b2377378957b2134e283b9c631dfcb90d5 DIFF: https://github.com/llvm/llvm-project/commit/73c0f4b2377378957b2134e283b9c631dfcb90d5.diff LOG: [CIR] Narrow blanket -fopenmp NYI guards to OGCG conditions (#233671) Ordinary code compiled with -fopenmp hit errorNYI on every assignment, inc/dec, member access and global reference Added: clang/test/CIR/CodeGenOpenMP/non-openmp-code.cpp Modified: clang/include/clang/CIR/MissingFeatures.h clang/lib/CIR/CodeGen/CIRGenExpr.cpp clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp clang/lib/CIR/CodeGen/CIRGenModule.cpp Removed: ################################################################################ diff --git a/clang/include/clang/CIR/MissingFeatures.h b/clang/include/clang/CIR/MissingFeatures.h index b7928e0aa38cb..7beb06541f7b6 100644 --- a/clang/include/clang/CIR/MissingFeatures.h +++ b/clang/include/clang/CIR/MissingFeatures.h @@ -273,6 +273,8 @@ struct MissingFeatures { static bool msvcBuiltins() { return false; } static bool openCL() { return false; } static bool openMP() { return false; } + static bool openMPLastprivateConditional() { return false; } + static bool openMPNontemporalDecl() { return false; } static bool sycl() { return false; } static bool opTBAA() { return false; } static bool peepholeProtection() { return false; } diff --git a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp index a8181c8c6a5b4..2637266cf3fee 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp @@ -1906,7 +1906,9 @@ LValue CIRGenFunction::emitMemberExpr(const MemberExpr *e) { // If the member was explicitly marked as nontemporal, mark it as // nontemporal. If the base lvalue is marked as nontemporal, mark access // to children as nontemporal too. - cgm.errorNYI(e->getSourceRange(), "emitMemberExpr: OpenMP"); + assert(!cir::MissingFeatures::openMPNontemporalDecl()); + if (baseLV.isNontemporal()) + lv.setNontemporal(true); } return lv; } @@ -2272,10 +2274,7 @@ LValue CIRGenFunction::emitBinaryOperatorLValue(const BinaryOperator *e) { else emitStoreThroughLValue(rv, lv); - if (getLangOpts().OpenMP) { - cgm.errorNYI(e->getSourceRange(), "openmp"); - return {}; - } + assert(!cir::MissingFeatures::openMPLastprivateConditional()); return lv; } diff --git a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp index 56f45247e5905..e245287931795 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp @@ -1087,8 +1087,7 @@ LValue CIRGenFunction::emitComplexAssignmentLValue(const BinaryOperator *e) { mlir::Value value; // ignored LValue lvalue = ComplexExprEmitter(*this).emitBinAssignLValue(e, value); - if (getLangOpts().OpenMP) - cgm.errorNYI("emitComplexAssignmentLValue OpenMP"); + assert(!cir::MissingFeatures::openMPLastprivateConditional()); return lvalue; } @@ -1144,8 +1143,7 @@ mlir::Value CIRGenFunction::emitComplexPrePostIncDec(const UnaryOperator *e, // Store the updated result through the lvalue. emitStoreOfComplex(loc, incVal, lv, /*isInit=*/false); - if (getLangOpts().OpenMP) - cgm.errorNYI(loc, "emitComplexPrePostIncDec OpenMP"); + assert(!cir::MissingFeatures::openMPLastprivateConditional()); // If this is a postinc, return the value read from memory, otherwise use the // updated value. diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp index 5d2b946c9bf42..8e6ded0527cc9 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp @@ -634,8 +634,7 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> { mlir::Value emitFixedPointIncDec(const UnaryOperator *e, mlir::Value value, QualType type); mlir::Value emitScalarPrePostIncDec(const UnaryOperator *e, LValue lv) { - if (cgf.getLangOpts().OpenMP) - cgf.cgm.errorNYI(e->getSourceRange(), "inc/dec OpenMP"); + assert(!cir::MissingFeatures::openMPLastprivateConditional()); QualType type = e->getSubExpr()->getType(); @@ -1738,8 +1737,7 @@ LValue ScalarExprEmitter::emitCompoundAssignLValue( else cgf.emitStoreThroughLValue(RValue::get(result), lhsLV); - if (cgf.getLangOpts().OpenMP) - cgf.cgm.errorNYI(e->getSourceRange(), "openmp"); + assert(!cir::MissingFeatures::openMPLastprivateConditional()); return lhsLV; } diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp index f91074afe6f18..81b8c59ef90dc 100644 --- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp @@ -1033,8 +1033,8 @@ LangAS CIRGenModule::getGlobalVarAddressSpace(const VarDecl *d) { return LangAS::cuda_device; } - if (langOpts.OpenMP) - errorNYI("OpenMP global address space"); + if (langOpts.OpenMP && d && d->hasAttr<OMPAllocateDeclAttr>()) + errorNYI(d->getSourceRange(), "OpenMP global address space"); return getTargetCIRGenInfo().getGlobalVarAddressSpace(*this, d); } diff --git a/clang/test/CIR/CodeGenOpenMP/non-openmp-code.cpp b/clang/test/CIR/CodeGenOpenMP/non-openmp-code.cpp new file mode 100644 index 0000000000000..d3f4e62b3d10d --- /dev/null +++ b/clang/test/CIR/CodeGenOpenMP/non-openmp-code.cpp @@ -0,0 +1,76 @@ +// RUN: %clang_cc1 -fopenmp -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o %t.cir +// RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR +// RUN: %clang_cc1 -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o %t-offload.cir +// RUN: FileCheck --input-file=%t-offload.cir %s -check-prefix=CIR +// RUN: %clang_cc1 -fopenmp -triple x86_64-unknown-linux-gnu -fclangir -emit-llvm %s -o %t-cir.ll +// RUN: FileCheck --input-file=%t-cir.ll %s -check-prefixes=LLVM,LLVMCIR +// RUN: %clang_cc1 -fopenmp -triple x86_64-unknown-linux-gnu -emit-llvm %s -o %t.ll +// RUN: FileCheck --input-file=%t.ll %s -check-prefixes=LLVM,OGCG + +// Ordinary code compiled with -fopenmp. + +struct S { + int x; +}; + +void scalar_ops(S *s, int v) { + static int g; + g = v; + g += v; + ++g; + s->x = g; +} + +// CIR: cir.global "private" internal dso_local @[[G:_ZZ10scalar_opsP1SiE1g]] = #cir.int<0> : !s32i +// CIR: cir.func{{.*}} @_Z10scalar_opsP1Si +// CIR: %[[G_PTR:.*]] = cir.get_global @[[G]] : !cir.ptr<!s32i> +// CIR: cir.store{{.*}} %{{.*}}, %[[G_PTR]] : !s32i, !cir.ptr<!s32i> +// CIR: %[[G1:.*]] = cir.load{{.*}} %[[G_PTR]] : !cir.ptr<!s32i>, !s32i +// CIR: %[[ADD:.*]] = cir.add nsw %[[G1]], %{{.*}} : !s32i +// CIR: cir.store{{.*}} %[[ADD]], %[[G_PTR]] : !s32i, !cir.ptr<!s32i> +// CIR: %[[G2:.*]] = cir.load{{.*}} %[[G_PTR]] : !cir.ptr<!s32i>, !s32i +// CIR: %[[INC:.*]] = cir.inc nsw %[[G2]] : !s32i +// CIR: cir.store{{.*}} %[[INC]], %[[G_PTR]] : !s32i, !cir.ptr<!s32i> +// CIR: %[[X:.*]] = cir.get_member %{{.*}}[0] {name = "x"} : !cir.ptr<!rec_S> -> !cir.ptr<!s32i> +// CIR: cir.store{{.*}} %{{.*}}, %[[X]] : !s32i, !cir.ptr<!s32i> + +// LLVM: @[[G:_ZZ10scalar_opsP1SiE1g]] = internal global i32 0 +// LLVM: define{{.*}} void @_Z10scalar_opsP1Si +// LLVM: store i32 %{{.*}}, ptr @[[G]] +// LLVM: %[[G1:.*]] = load i32, ptr @[[G]] +// LLVM: %[[ADD:.*]] = add nsw i32 %[[G1]], %{{.*}} +// LLVM: store i32 %[[ADD]], ptr @[[G]] +// LLVM: %[[G2:.*]] = load i32, ptr @[[G]] +// LLVM: %[[INC:.*]] = add nsw i32 %[[G2]], 1 +// LLVM: store i32 %[[INC]], ptr @[[G]] +// LLVM: %[[X:.*]] = getelementptr inbounds nuw %struct.S, ptr %{{.*}}, i32 0, i32 0 +// LLVM: store i32 %{{.*}}, ptr %[[X]] + +void complex_ops(float _Complex *c, float _Complex v) { + *c = v; + ++*c; +} + +// CIR: cir.func{{.*}} @_Z11complex_opsPCfS_ +// CIR: %[[V:.*]] = cir.load align(4) %{{.*}} : !cir.ptr<!cir.complex<!cir.float>>, !cir.complex<!cir.float> +// CIR: %[[C_PTR:.*]] = cir.load deref{{.*}} %{{.*}} : !cir.ptr<!cir.ptr<!cir.complex<!cir.float>>>, !cir.ptr<!cir.complex<!cir.float>> +// CIR: cir.store{{.*}} %[[V]], %[[C_PTR]] : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>> +// CIR: %[[C_PTR2:.*]] = cir.load deref{{.*}} %{{.*}} : !cir.ptr<!cir.ptr<!cir.complex<!cir.float>>>, !cir.ptr<!cir.complex<!cir.float>> +// CIR: %[[C:.*]] = cir.load{{.*}} %[[C_PTR2]] : !cir.ptr<!cir.complex<!cir.float>>, !cir.complex<!cir.float> +// CIR: %[[REAL:.*]] = cir.complex.real %[[C]] : !cir.complex<!cir.float> -> !cir.float +// CIR: %[[IMAG:.*]] = cir.complex.imag %[[C]] : !cir.complex<!cir.float> -> !cir.float +// CIR: %[[INC:.*]] = cir.fadd %[[REAL]], %{{.*}} : !cir.float +// CIR: %[[RES:.*]] = cir.complex.create %[[INC]], %[[IMAG]] : !cir.float -> !cir.complex<!cir.float> +// CIR: cir.store{{.*}} %[[RES]], %{{.*}} : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>> + +// LLVMCIR: define{{.*}} void @_Z11complex_opsPCfS_ +// LLVMCIR: store { float, float } %{{.*}}, ptr %{{.*}} +// LLVMCIR: %[[REAL:.*]] = extractvalue { float, float } %{{.*}}, 0 +// LLVMCIR: %[[INC:.*]] = fadd float %[[REAL]], 1.000000e+00 +// LLVMCIR: store { float, float } %{{.*}}, ptr %{{.*}} + +// OGCG: define{{.*}} void @_Z11complex_opsPCfS_ +// OGCG: store float %{{.*}}, ptr %{{.*}} +// OGCG: store float %{{.*}}, ptr %{{.*}} +// OGCG: %[[REAL:.*]] = load float, ptr %{{.*}} +// OGCG: %[[INC:.*]] = fadd float %[[REAL]], 1.000000e+00 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
