Author: Nikita Popov Date: 2026-07-17T15:19:44+02:00 New Revision: b9f5bcbcfbe6aa4943c808afd3bb82243ecb3193
URL: https://github.com/llvm/llvm-project/commit/b9f5bcbcfbe6aa4943c808afd3bb82243ecb3193 DIFF: https://github.com/llvm/llvm-project/commit/b9f5bcbcfbe6aa4943c808afd3bb82243ecb3193.diff LOG: Revert "[clang][CodeGen][X86_64] Honor per-function AVX ABI in C/C++ call paths, maintain old psABI for PlayStation." (#210303) Reverts llvm/llvm-project#193298 Causes a major compile-time regression. Added: Modified: clang/docs/ReleaseNotes.md clang/include/clang/Basic/ABIVersions.def clang/include/clang/Basic/LangOptions.def clang/include/clang/CodeGen/CGFunctionInfo.h clang/include/clang/CodeGen/CodeGenABITypes.h clang/lib/CodeGen/ABIInfo.h clang/lib/CodeGen/CGCUDARuntime.cpp clang/lib/CodeGen/CGCall.cpp clang/lib/CodeGen/CGClass.cpp clang/lib/CodeGen/CGDeclCXX.cpp clang/lib/CodeGen/CGExpr.cpp clang/lib/CodeGen/CGExprCXX.cpp clang/lib/CodeGen/CGExprComplex.cpp clang/lib/CodeGen/CGHLSLRuntime.cpp clang/lib/CodeGen/CGObjCRuntime.cpp clang/lib/CodeGen/CGVTables.cpp clang/lib/CodeGen/CodeGenABITypes.cpp clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/CodeGen/CodeGenFunction.h clang/lib/CodeGen/CodeGenTypes.h clang/lib/CodeGen/ItaniumCXXABI.cpp clang/lib/CodeGen/MicrosoftCXXABI.cpp clang/lib/CodeGen/Targets/X86.cpp clang/test/CodeGen/sysv_abi.c clang/unittests/CodeGen/CodeGenExternalTest.cpp clang/unittests/CodeGen/TestCompiler.h Removed: clang/test/CodeGen/target-avx-function-abi.c clang/test/CodeGenCXX/target-avx-method-abi.cpp ################################################################################ diff --git a/clang/docs/ReleaseNotes.md b/clang/docs/ReleaseNotes.md index 06ded79f4d995..ecf192125b2ed 100644 --- a/clang/docs/ReleaseNotes.md +++ b/clang/docs/ReleaseNotes.md @@ -50,13 +50,6 @@ latest release, please see the [Clang Web Site](https://clang.llvm.org) or the ### ABI Changes in This Version -- Except on PlayStation, Clang now derives the x86-64 System V AVX ABI level -for 256- and 512-bit vector arguments and returns from effective per-function -target features. Features and `arch=` CPUs that imply AVX or AVX512F are -honored, and calls use the caller's features, matching GCC. Per-function -features cannot lower the translation-unit ABI level; -`-fclang-abi-compat=23` restores the previous behavior. (#GH193298) - ### AST Dumping Potentially Breaking Changes ### Clang Frontend Potentially Breaking Changes diff --git a/clang/include/clang/Basic/ABIVersions.def b/clang/include/clang/Basic/ABIVersions.def index 15fb8ddf6d774..a9f72481ee0ea 100644 --- a/clang/include/clang/Basic/ABIVersions.def +++ b/clang/include/clang/Basic/ABIVersions.def @@ -140,12 +140,6 @@ ABI_VER_MAJOR(21) /// local classes as nested-name entities instead of local-name entities. ABI_VER_MAJOR(22) -/// Attempt to be ABI-compatible with code generated by Clang 23.0.x. -/// This causes clang to: -/// - Ignore per-function target attributes when determining the x86 AVX ABI -/// level. -ABI_VER_MAJOR(23) - /// Conform to the underlying platform's C and C++ ABIs as closely as we can. ABI_VER_LATEST(Latest) diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def index 922124b696d43..1fb491a54a278 100644 --- a/clang/include/clang/Basic/LangOptions.def +++ b/clang/include/clang/Basic/LangOptions.def @@ -426,7 +426,7 @@ LANGOPT(ForceEmitVTables, 1, 0, NotCompatible, "whether to emit all vtables") LANGOPT(AllowEditorPlaceholders, 1, 0, Benign, "allow editor placeholders in source") -ENUM_LANGOPT(ClangABICompat, ClangABI, 5, ClangABI::Latest, NotCompatible, +ENUM_LANGOPT(ClangABICompat, ClangABI, 4, ClangABI::Latest, NotCompatible, "version of Clang that we should attempt to be ABI-compatible " "with") diff --git a/clang/include/clang/CodeGen/CGFunctionInfo.h b/clang/include/clang/CodeGen/CGFunctionInfo.h index d1fc80337d859..713b52a4cc2b8 100644 --- a/clang/include/clang/CodeGen/CGFunctionInfo.h +++ b/clang/include/clang/CodeGen/CGFunctionInfo.h @@ -17,9 +17,10 @@ #include "clang/AST/CanonicalType.h" #include "clang/AST/CharUnits.h" +#include "clang/AST/Decl.h" #include "clang/AST/Type.h" -#include "llvm/ADT/FoldingSet.h" #include "llvm/IR/DerivedTypes.h" +#include "llvm/ADT/FoldingSet.h" #include "llvm/Support/TrailingObjects.h" #include <cassert> @@ -652,10 +653,6 @@ class CGFunctionInfo final /// Log 2 of the maximum vector width. unsigned MaxVectorWidth : 4; - /// X86 AVX Level, can be diff erent from global / module level AVX level - /// because of target attributes. - unsigned X86ABIAVXLevel = 0; - RequiredArgs Required; /// The struct representing all arguments passed in memory. Only used when @@ -686,8 +683,7 @@ class CGFunctionInfo final public: static CGFunctionInfo * create(unsigned llvmCC, bool instanceMethod, bool chainCall, - bool delegateCall, unsigned X86ABIAVXLevel, - const FunctionType::ExtInfo &extInfo, + bool delegateCall, const FunctionType::ExtInfo &extInfo, ArrayRef<ExtParameterInfo> paramInfos, CanQualType resultType, ArrayRef<CanQualType> argTypes, RequiredArgs required); void operator delete(void *p) { ::operator delete(p); } @@ -813,8 +809,6 @@ class CGFunctionInfo final MaxVectorWidth = llvm::countr_zero(Width) + 1; } - unsigned getX86ABIAVXLevel() const { return X86ABIAVXLevel; } - void Profile(llvm::FoldingSetNodeID &ID) { ID.AddInteger(getASTCallingConvention()); ID.AddBoolean(InstanceMethod); @@ -827,7 +821,6 @@ class CGFunctionInfo final ID.AddInteger(RegParm); ID.AddBoolean(NoCfCheck); ID.AddBoolean(CmseNSCall); - ID.AddInteger(X86ABIAVXLevel); ID.AddInteger(Required.getOpaqueData()); ID.AddBoolean(HasExtParameterInfos); if (HasExtParameterInfos) { @@ -840,7 +833,6 @@ class CGFunctionInfo final } static void Profile(llvm::FoldingSetNodeID &ID, bool InstanceMethod, bool ChainCall, bool IsDelegateCall, - unsigned X86ABIAVXLevel, const FunctionType::ExtInfo &info, ArrayRef<ExtParameterInfo> paramInfos, RequiredArgs required, CanQualType resultType, @@ -856,7 +848,6 @@ class CGFunctionInfo final ID.AddInteger(info.getRegParm()); ID.AddBoolean(info.getNoCfCheck()); ID.AddBoolean(info.getCmseNSCall()); - ID.AddInteger(X86ABIAVXLevel); ID.AddInteger(required.getOpaqueData()); ID.AddBoolean(!paramInfos.empty()); if (!paramInfos.empty()) { diff --git a/clang/include/clang/CodeGen/CodeGenABITypes.h b/clang/include/clang/CodeGen/CodeGenABITypes.h index e79c31d3efa21..627dd0f0453ac 100644 --- a/clang/include/clang/CodeGen/CodeGenABITypes.h +++ b/clang/include/clang/CodeGen/CodeGenABITypes.h @@ -81,22 +81,20 @@ const CGFunctionInfo & arrangeCXXMethodCall(CodeGenModule &CGM, CanQualType returnType, ArrayRef<CanQualType> argTypes, FunctionType::ExtInfo info, ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, - RequiredArgs args, const FunctionDecl *CallerFD); + RequiredArgs args); const CGFunctionInfo &arrangeFreeFunctionCall( CodeGenModule &CGM, CanQualType returnType, ArrayRef<CanQualType> argTypes, FunctionType::ExtInfo info, - ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, RequiredArgs args, - const FunctionDecl *CallerFD); + ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, + RequiredArgs args); // An overload with an empty `paramInfos` inline const CGFunctionInfo & arrangeFreeFunctionCall(CodeGenModule &CGM, CanQualType returnType, ArrayRef<CanQualType> argTypes, - FunctionType::ExtInfo info, RequiredArgs args, - const FunctionDecl *CallerFD) { - return arrangeFreeFunctionCall(CGM, returnType, argTypes, info, {}, args, - CallerFD); + FunctionType::ExtInfo info, RequiredArgs args) { + return arrangeFreeFunctionCall(CGM, returnType, argTypes, info, {}, args); } /// Returns the implicit arguments to add to a complete, non-delegating C++ diff --git a/clang/lib/CodeGen/ABIInfo.h b/clang/lib/CodeGen/ABIInfo.h index b9a970919740f..4563154d50960 100644 --- a/clang/lib/CodeGen/ABIInfo.h +++ b/clang/lib/CodeGen/ABIInfo.h @@ -26,7 +26,6 @@ class FixedVectorType; namespace clang { class ASTContext; class CodeGenOptions; -class FunctionDecl; class TargetInfo; namespace CodeGen { @@ -70,14 +69,6 @@ class ABIInfo { /// functions. llvm::CallingConv::ID getRuntimeCC() const { return RuntimeCC; } - // Get X86ABIAVXLevel for the given FunctionDecl and ExtInfo. - // This can be diff erent than the global / module level X86ABIAVXLevel - // due to function attributes. - virtual unsigned getX86ABIAVXLevel(const FunctionDecl *, - const FunctionType::ExtInfo &) const { - return 0; - } - virtual void computeInfo(CodeGen::CGFunctionInfo &FI) const = 0; /// EmitVAArg - Emit the target dependent code to load a value of diff --git a/clang/lib/CodeGen/CGCUDARuntime.cpp b/clang/lib/CodeGen/CGCUDARuntime.cpp index 0b09546453138..9c831b26c3a7b 100644 --- a/clang/lib/CodeGen/CGCUDARuntime.cpp +++ b/clang/lib/CodeGen/CGCUDARuntime.cpp @@ -53,8 +53,7 @@ static llvm::Value *emitGetParamBuf(CodeGenFunction &CGF, Args.add(RValue::get(CGF.CGM.getSize(Offset)), CGF.getContext().getSizeType()); const CGFunctionInfo &CallInfo = CGF.CGM.getTypes().arrangeFreeFunctionCall( - Args, GetParamBufProto, /*ChainCall=*/false, - CGF.getCurrentFunctionDecl()); + Args, GetParamBufProto, /*ChainCall=*/false); auto Ret = CGF.EmitCall(CallInfo, Callee, /*ReturnValue=*/{}, Args); return Ret.getScalarVal(); @@ -117,7 +116,7 @@ RValue CGCUDARuntime::EmitCUDADeviceKernelCallExpr( LaunchCallArgs[1] = CallArg(RValue::get(Config), CGM.getContext().VoidPtrTy); const CGFunctionInfo &LaunchCallInfo = CGM.getTypes().arrangeFreeFunctionCall( LaunchCallArgs, LaunchCalleeFuncTy->getAs<FunctionProtoType>(), - /*ChainCall=*/false, CGF.getCurrentFunctionDecl()); + /*ChainCall=*/false); CGF.EmitCall(LaunchCallInfo, LaunchCallee, ReturnValue, LaunchCallArgs, CallOrInvoke, /*IsMustTail=*/false, E->getExprLoc()); diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index a29f7aab0e58b..08cb9860f2f92 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -168,7 +168,7 @@ CodeGenTypes::arrangeFreeFunctionType(CanQual<FunctionNoProtoType> FTNP) { // variadic type. return arrangeLLVMFunctionInfo(FTNP->getReturnType().getUnqualifiedType(), FnInfoOpts::None, {}, FTNP->getExtInfo(), {}, - RequiredArgs(0), /*ABIInfoFD=*/nullptr); + RequiredArgs(0)); } static void addExtParameterInfosForCall( @@ -246,8 +246,7 @@ arrangeLLVMFunctionInfo(CodeGenTypes &CGT, bool instanceMethod, FnInfoOpts opts = instanceMethod ? FnInfoOpts::IsInstanceMethod : FnInfoOpts::None; return CGT.arrangeLLVMFunctionInfo(resultType, opts, prefix, - FTP->getExtInfo(), paramInfos, Required, - /*ABIInfoFD=*/nullptr); + FTP->getExtInfo(), paramInfos, Required); } using CanQualTypeList = SmallVector<CanQualType, 16>; @@ -358,16 +357,10 @@ CodeGenTypes::arrangeCXXMethodType(const CXXRecordDecl *RD, // Add the 'this' pointer. argTypes.push_back(DeriveThisType(RD, MD)); - auto CanonicalFTP = - FTP->getCanonicalTypeUnqualified().getAs<FunctionProtoType>(); - ExtParameterInfoList paramInfos; - RequiredArgs required = RequiredArgs::forPrototypePlus( - CanonicalFTP.getTypePtr(), argTypes.size()); - appendParameterTypes(*this, argTypes, paramInfos, CanonicalFTP); - return arrangeLLVMFunctionInfo( - CanonicalFTP->getReturnType().getUnqualifiedType(), - FnInfoOpts::IsInstanceMethod, argTypes, CanonicalFTP->getExtInfo(), - paramInfos, required, MD); + + return ::arrangeLLVMFunctionInfo( + *this, /*instanceMethod=*/true, argTypes, + FTP->getCanonicalTypeUnqualified().getAs<FunctionProtoType>()); } /// Set calling convention for CUDA/HIP kernel. @@ -400,13 +393,7 @@ CodeGenTypes::arrangeCXXMethodDeclaration(const CXXMethodDecl *MD) { return arrangeCXXMethodType(ThisType, prototype.getTypePtr(), MD); } - CanQualTypeList argTypes; - ExtParameterInfoList paramInfos; - appendParameterTypes(*this, argTypes, paramInfos, prototype); - return arrangeLLVMFunctionInfo( - prototype->getReturnType().getUnqualifiedType(), FnInfoOpts::None, - argTypes, prototype->getExtInfo(), paramInfos, - RequiredArgs::forPrototypePlus(prototype.getTypePtr(), 0), MD); + return arrangeFreeFunctionType(prototype); } bool CodeGenTypes::inheritingCtorHasParams( @@ -465,7 +452,7 @@ CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) { ? CGM.getContext().VoidPtrTy : Context.VoidTy; return arrangeLLVMFunctionInfo(resultType, FnInfoOpts::IsInstanceMethod, - argTypes, extInfo, paramInfos, required, MD); + argTypes, extInfo, paramInfos, required); } static CanQualTypeList getArgTypesForCall(ASTContext &ctx, @@ -504,8 +491,7 @@ getExtParameterInfosForCall(const FunctionProtoType *proto, unsigned prefixArgs, /// given CXXConstructorDecl. const CGFunctionInfo &CodeGenTypes::arrangeCXXConstructorCall( const CallArgList &args, const CXXConstructorDecl *D, CXXCtorType CtorKind, - unsigned ExtraPrefixArgs, unsigned ExtraSuffixArgs, - const FunctionDecl *ABIInfoFD, bool PassProtoArgs) { + unsigned ExtraPrefixArgs, unsigned ExtraSuffixArgs, bool PassProtoArgs) { CanQualTypeList ArgTypes; for (const auto &Arg : args) ArgTypes.push_back(Context.getCanonicalParamType(Arg.Ty)); @@ -536,8 +522,7 @@ const CGFunctionInfo &CodeGenTypes::arrangeCXXConstructorCall( } return arrangeLLVMFunctionInfo(ResultType, FnInfoOpts::IsInstanceMethod, - ArgTypes, Info, ParamInfos, Required, - ABIInfoFD); + ArgTypes, Info, ParamInfos, Required); } /// Arrange the argument and result information for the declaration or @@ -566,17 +551,10 @@ CodeGenTypes::arrangeFunctionDeclaration(const GlobalDecl GD) { if (CanQual<FunctionNoProtoType> noProto = FTy.getAs<FunctionNoProtoType>()) { return arrangeLLVMFunctionInfo(noProto->getReturnType(), FnInfoOpts::None, {}, noProto->getExtInfo(), {}, - RequiredArgs::All, FD); + RequiredArgs::All); } - CanQual<FunctionProtoType> FTP = FTy.castAs<FunctionProtoType>(); - CanQualTypeList argTypes; - ExtParameterInfoList paramInfos; - appendParameterTypes(*this, argTypes, paramInfos, FTP); - return arrangeLLVMFunctionInfo(FTP->getReturnType().getUnqualifiedType(), - FnInfoOpts::None, argTypes, FTP->getExtInfo(), - paramInfos, - RequiredArgs::forPrototypePlus(FTP, 0), FD); + return arrangeFreeFunctionType(FTy.castAs<FunctionProtoType>()); } /// Arrange the argument and result information for the declaration or @@ -625,7 +603,7 @@ CodeGenTypes::arrangeObjCMessageSendSignature(const ObjCMethodDecl *MD, return arrangeLLVMFunctionInfo(GetReturnType(MD->getReturnType()), FnInfoOpts::None, argTys, einfo, extParamInfos, - required, /*ABIInfoFD=*/nullptr); + required); } const CGFunctionInfo & @@ -635,8 +613,7 @@ CodeGenTypes::arrangeUnprototypedObjCMessageSend(QualType returnType, FunctionType::ExtInfo einfo; return arrangeLLVMFunctionInfo(GetReturnType(returnType), FnInfoOpts::None, - argTypes, einfo, {}, RequiredArgs::All, - nullptr); + argTypes, einfo, {}, RequiredArgs::All); } const CGFunctionInfo &CodeGenTypes::arrangeGlobalDeclaration(GlobalDecl GD) { @@ -659,7 +636,7 @@ CodeGenTypes::arrangeUnprototypedMustTailThunk(const CXXMethodDecl *MD) { CanQual<FunctionProtoType> FTP = GetFormalType(MD); CanQualType ArgTys[] = {DeriveThisType(MD->getParent(), MD)}; return arrangeLLVMFunctionInfo(Context.VoidTy, FnInfoOpts::None, ArgTys, - FTP->getExtInfo(), {}, RequiredArgs(1), MD); + FTP->getExtInfo(), {}, RequiredArgs(1)); } const CGFunctionInfo & @@ -679,7 +656,7 @@ CodeGenTypes::arrangeMSCtorClosure(const CXXConstructorDecl *CD, /*IsVariadic=*/false, /*IsCXXMethod=*/true); return arrangeLLVMFunctionInfo(Context.VoidTy, FnInfoOpts::IsInstanceMethod, ArgTys, FunctionType::ExtInfo(CC), {}, - RequiredArgs::All, /*ABIInfoFD=*/nullptr); + RequiredArgs::All); } /// Arrange a call as unto a free function, except possibly with an @@ -687,8 +664,7 @@ CodeGenTypes::arrangeMSCtorClosure(const CXXConstructorDecl *CD, static const CGFunctionInfo & arrangeFreeFunctionLikeCall(CodeGenTypes &CGT, CodeGenModule &CGM, const CallArgList &args, const FunctionType *fnType, - unsigned numExtraRequiredArgs, bool chainCall, - const FunctionDecl *ABIInfoFD) { + unsigned numExtraRequiredArgs, bool chainCall) { assert(args.size() >= numExtraRequiredArgs); ExtParameterInfoList paramInfos; @@ -721,7 +697,7 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT, CodeGenModule &CGM, FnInfoOpts opts = chainCall ? FnInfoOpts::IsChainCall : FnInfoOpts::None; return CGT.arrangeLLVMFunctionInfo(GetReturnType(fnType->getReturnType()), opts, argTypes, fnType->getExtInfo(), - paramInfos, required, ABIInfoFD); + paramInfos, required); } /// Figure out the rules for calling a function with the given formal @@ -729,10 +705,9 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT, CodeGenModule &CGM, /// because the function might be unprototyped, in which case it's /// target-dependent in crazy ways. const CGFunctionInfo &CodeGenTypes::arrangeFreeFunctionCall( - const CallArgList &args, const FunctionType *fnType, bool chainCall, - const FunctionDecl *ABIInfoFD) { + const CallArgList &args, const FunctionType *fnType, bool chainCall) { return arrangeFreeFunctionLikeCall(*this, CGM, args, fnType, - chainCall ? 1 : 0, chainCall, ABIInfoFD); + chainCall ? 1 : 0, chainCall); } /// A block function is essentially a free function with an @@ -740,10 +715,8 @@ const CGFunctionInfo &CodeGenTypes::arrangeFreeFunctionCall( const CGFunctionInfo & CodeGenTypes::arrangeBlockFunctionCall(const CallArgList &args, const FunctionType *fnType) { - // FIXME: Pass the enclosing function's ABI information so block calls use - // the caller's target features. return arrangeFreeFunctionLikeCall(*this, CGM, args, fnType, 1, - /*chainCall=*/false, nullptr); + /*chainCall=*/false); } const CGFunctionInfo & @@ -753,11 +726,10 @@ CodeGenTypes::arrangeBlockFunctionDeclaration(const FunctionProtoType *proto, getExtParameterInfosForCall(proto, 1, params.size()); CanQualTypeList argTypes = getArgTypesForDeclaration(Context, params); - // FIXME: Use the block's target features when arranging its invoke function. - return arrangeLLVMFunctionInfo( - GetReturnType(proto->getReturnType()), FnInfoOpts::None, argTypes, - proto->getExtInfo(), paramInfos, RequiredArgs::forPrototypePlus(proto, 1), - /*ABIInfoFD=*/nullptr); + return arrangeLLVMFunctionInfo(GetReturnType(proto->getReturnType()), + FnInfoOpts::None, argTypes, + proto->getExtInfo(), paramInfos, + RequiredArgs::forPrototypePlus(proto, 1)); } const CGFunctionInfo & @@ -768,7 +740,7 @@ CodeGenTypes::arrangeBuiltinFunctionCall(QualType resultType, argTypes.push_back(Context.getCanonicalParamType(Arg.Ty)); return arrangeLLVMFunctionInfo(GetReturnType(resultType), FnInfoOpts::None, argTypes, FunctionType::ExtInfo(), - /*paramInfos=*/{}, RequiredArgs::All, nullptr); + /*paramInfos=*/{}, RequiredArgs::All); } const CGFunctionInfo & @@ -778,14 +750,14 @@ CodeGenTypes::arrangeBuiltinFunctionDeclaration(QualType resultType, return arrangeLLVMFunctionInfo(GetReturnType(resultType), FnInfoOpts::None, argTypes, FunctionType::ExtInfo(), {}, - RequiredArgs::All, /*ABIInfoFD=*/nullptr); + RequiredArgs::All); } const CGFunctionInfo &CodeGenTypes::arrangeBuiltinFunctionDeclaration( CanQualType resultType, ArrayRef<CanQualType> argTypes) { return arrangeLLVMFunctionInfo(resultType, FnInfoOpts::None, argTypes, - FunctionType::ExtInfo(), {}, RequiredArgs::All, - /*ABIInfoFD=*/nullptr); + FunctionType::ExtInfo(), {}, + RequiredArgs::All); } const CGFunctionInfo &CodeGenTypes::arrangeDeviceKernelCallerDeclaration( @@ -795,8 +767,7 @@ const CGFunctionInfo &CodeGenTypes::arrangeDeviceKernelCallerDeclaration( return arrangeLLVMFunctionInfo(GetReturnType(resultType), FnInfoOpts::None, argTypes, FunctionType::ExtInfo(CC_DeviceKernel), - /*paramInfos=*/{}, RequiredArgs::All, - /*ABIInfoFD=*/nullptr); + /*paramInfos=*/{}, RequiredArgs::All); } /// Arrange a call to a C++ method, passing the given arguments. @@ -805,8 +776,7 @@ const CGFunctionInfo &CodeGenTypes::arrangeDeviceKernelCallerDeclaration( /// does not count `this`. const CGFunctionInfo &CodeGenTypes::arrangeCXXMethodCall( const CallArgList &args, const FunctionProtoType *proto, - RequiredArgs required, unsigned numPrefixArgs, - const FunctionDecl *ABIInfoFD) { + RequiredArgs required, unsigned numPrefixArgs) { assert(numPrefixArgs + 1 <= args.size() && "Emitting a call with less args than the required prefix?"); // Add one to account for `this`. It's a bit awkward here, but we don't count @@ -819,23 +789,19 @@ const CGFunctionInfo &CodeGenTypes::arrangeCXXMethodCall( FunctionType::ExtInfo info = proto->getExtInfo(); return arrangeLLVMFunctionInfo(GetReturnType(proto->getReturnType()), FnInfoOpts::IsInstanceMethod, argTypes, info, - paramInfos, required, ABIInfoFD); + paramInfos, required); } const CGFunctionInfo &CodeGenTypes::arrangeNullaryFunction() { return arrangeLLVMFunctionInfo(getContext().VoidTy, FnInfoOpts::None, {}, - FunctionType::ExtInfo(), {}, RequiredArgs::All, - /*ABIInfoFD=*/nullptr); + FunctionType::ExtInfo(), {}, + RequiredArgs::All); } const CGFunctionInfo &CodeGenTypes::arrangeCall(const CGFunctionInfo &signature, - const CallArgList &args, - const FunctionDecl *ABIInfoFD) { + const CallArgList &args) { assert(signature.arg_size() <= args.size()); - unsigned X86ABIAVXLevel = - CGM.getABIInfo().getX86ABIAVXLevel(ABIInfoFD, signature.getExtInfo()); - if (signature.arg_size() == args.size() && - signature.getX86ABIAVXLevel() == X86ABIAVXLevel) + if (signature.arg_size() == args.size()) return signature; ExtParameterInfoList paramInfos; @@ -855,13 +821,9 @@ const CGFunctionInfo &CodeGenTypes::arrangeCall(const CGFunctionInfo &signature, opts |= FnInfoOpts::IsChainCall; if (signature.isDelegateCall()) opts |= FnInfoOpts::IsDelegateCall; - - const CGFunctionInfo *newFI = findOrInsertCGFunctionInfo( - signature.isInstanceMethod(), signature.isChainCall(), - signature.isDelegateCall(), X86ABIAVXLevel, signature.getExtInfo(), - paramInfos, signature.getRequiredArgs(), signature.getReturnType(), - argTypes); - return *newFI; + return arrangeLLVMFunctionInfo(signature.getReturnType(), opts, argTypes, + signature.getExtInfo(), paramInfos, + signature.getRequiredArgs()); } namespace clang { @@ -1057,7 +1019,7 @@ const CGFunctionInfo &CodeGenTypes::arrangeLLVMFunctionInfo( CanQualType resultType, FnInfoOpts opts, ArrayRef<CanQualType> argTypes, FunctionType::ExtInfo info, ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, - RequiredArgs required, const FunctionDecl *ABIInfoFD) { + RequiredArgs required) { assert(llvm::all_of(argTypes, [](CanQualType T) { return T.isCanonicalAsParam(); })); @@ -1069,36 +1031,19 @@ const CGFunctionInfo &CodeGenTypes::arrangeLLVMFunctionInfo( (opts & FnInfoOpts::IsChainCall) == FnInfoOpts::IsChainCall; bool isDelegateCall = (opts & FnInfoOpts::IsDelegateCall) == FnInfoOpts::IsDelegateCall; - unsigned X86ABIAVXLevel = CGM.getABIInfo().getX86ABIAVXLevel(ABIInfoFD, info); - - const CGFunctionInfo *newFI = findOrInsertCGFunctionInfo( - isInstanceMethod, isChainCall, isDelegateCall, X86ABIAVXLevel, info, - paramInfos, required, resultType, argTypes); - return *newFI; -} - -CGFunctionInfo *CodeGenTypes::findOrInsertCGFunctionInfo( - bool isInstanceMethod, bool isChainCall, bool isDelegateCall, - unsigned X86ABIAVXLevel, const FunctionType::ExtInfo &info, - ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, - RequiredArgs required, CanQualType resultType, - ArrayRef<CanQualType> argTypes) { - llvm::FoldingSetNodeID ID; CGFunctionInfo::Profile(ID, isInstanceMethod, isChainCall, isDelegateCall, - X86ABIAVXLevel, info, paramInfos, required, - resultType, argTypes); + info, paramInfos, required, resultType, argTypes); void *insertPos = nullptr; CGFunctionInfo *FI = FunctionInfos.FindNodeOrInsertPos(ID, insertPos); if (FI) - return FI; + return *FI; unsigned CC = ClangCallConvToLLVMCallConv(info.getCC()); // Construct the function info. We co-allocate the ArgInfos. FI = CGFunctionInfo::create(CC, isInstanceMethod, isChainCall, isDelegateCall, - X86ABIAVXLevel, info, paramInfos, resultType, - argTypes, required); + info, paramInfos, resultType, argTypes, required); FunctionInfos.InsertNode(FI, insertPos); bool inserted = FunctionsBeingProcessed.insert(FI).second; @@ -1137,14 +1082,16 @@ CGFunctionInfo *CodeGenTypes::findOrInsertCGFunctionInfo( (void)erased; assert(erased && "Not in set?"); - return FI; + return *FI; } -CGFunctionInfo *CGFunctionInfo::create( - unsigned llvmCC, bool instanceMethod, bool chainCall, bool delegateCall, - unsigned X86ABIAVXLevel, const FunctionType::ExtInfo &info, - ArrayRef<ExtParameterInfo> paramInfos, CanQualType resultType, - ArrayRef<CanQualType> argTypes, RequiredArgs required) { +CGFunctionInfo *CGFunctionInfo::create(unsigned llvmCC, bool instanceMethod, + bool chainCall, bool delegateCall, + const FunctionType::ExtInfo &info, + ArrayRef<ExtParameterInfo> paramInfos, + CanQualType resultType, + ArrayRef<CanQualType> argTypes, + RequiredArgs required) { assert(paramInfos.empty() || paramInfos.size() == argTypes.size()); assert(!required.allowsOptionalArgs() || required.getNumRequiredArgs() <= argTypes.size()); @@ -1167,7 +1114,6 @@ CGFunctionInfo *CGFunctionInfo::create( FI->Required = required; FI->HasRegParm = info.getHasRegParm(); FI->RegParm = info.getRegParm(); - FI->X86ABIAVXLevel = X86ABIAVXLevel; FI->ArgStruct = nullptr; FI->ArgStructAlign = 0; FI->NumArgs = argTypes.size(); diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 9c0c1cbdeb219..39b8e50f68eaf 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -2339,8 +2339,8 @@ static bool canEmitDelegateCallArgs(CodeGenFunction &CGF, return false; // Likewise if they're inalloca. - const CGFunctionInfo &Info = CGF.CGM.getTypes().arrangeCXXConstructorCall( - Args, Ctor, Type, 0, 0, CGF.getCurrentFunctionDecl()); + const CGFunctionInfo &Info = + CGF.CGM.getTypes().arrangeCXXConstructorCall(Args, Ctor, Type, 0, 0); if (Info.usesInAlloca()) return false; } @@ -2400,8 +2400,7 @@ void CodeGenFunction::EmitCXXConstructorCall( // Emit the call. llvm::Constant *CalleePtr = CGM.getAddrOfCXXStructor(GlobalDecl(D, Type)); const CGFunctionInfo &Info = CGM.getTypes().arrangeCXXConstructorCall( - Args, D, Type, ExtraArgs.Prefix, ExtraArgs.Suffix, - getCurrentFunctionDecl(), PassPrototypeArgs); + Args, D, Type, ExtraArgs.Prefix, ExtraArgs.Suffix, PassPrototypeArgs); CGCallee Callee = CGCallee::forDirect(CalleePtr, GlobalDecl(D, Type)); EmitCall(Info, Callee, ReturnValueSlot(), Args, CallOrInvoke, false, Loc); @@ -3289,7 +3288,7 @@ void CodeGenFunction::EmitLambdaInAllocaImplFn( ArgTypes.push_back(I->type); *ImplFnInfo = &CGM.getTypes().arrangeLLVMFunctionInfo( FnInfo.getReturnType(), FnInfoOpts::IsDelegateCall, ArgTypes, - FnInfo.getExtInfo(), {}, FnInfo.getRequiredArgs(), CallOp); + FnInfo.getExtInfo(), {}, FnInfo.getRequiredArgs()); // Create mangled name as if this was a method named __impl. If for some // reason the name doesn't look as expected then just tack __impl to the diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index a54809c48037e..57c6bad67dab9 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -286,8 +286,7 @@ llvm::Function *CodeGenFunction::createTLSAtExitStub( const CGFunctionInfo &FI = CGM.getTypes().arrangeLLVMFunctionInfo( getContext().IntTy, FnInfoOpts::None, {getContext().IntTy}, - FunctionType::ExtInfo(), {}, RequiredArgs::All, - /*ABIInfoFD=*/nullptr); + FunctionType::ExtInfo(), {}, RequiredArgs::All); // Get the stub function type, int(*)(int,...). llvm::FunctionType *StubTy = diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 9201e40bc13a1..dd42e9550316d 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -7141,7 +7141,7 @@ RValue CodeGenFunction::EmitCall(QualType CalleeType, E->getDirectCallee(), /*ParamsToSkip=*/0, Order); const CGFunctionInfo &FnInfo = CGM.getTypes().arrangeFreeFunctionCall( - Args, FnType, /*ChainCall=*/Chain, getCurrentFunctionDecl()); + Args, FnType, /*ChainCall=*/Chain); if (ResolvedFnInfo) *ResolvedFnInfo = &FnInfo; diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp index e400a5c5a49c5..1769ab00ed56d 100644 --- a/clang/lib/CodeGen/CGExprCXX.cpp +++ b/clang/lib/CodeGen/CGExprCXX.cpp @@ -92,8 +92,7 @@ RValue CodeGenFunction::EmitCXXMemberOrOperatorCall( MemberCallInfo CallInfo = commonEmitCXXMemberOrOperatorCall( *this, MD, This, ImplicitParam, ImplicitParamTy, CE, Args, RtlArgs); auto &FnInfo = CGM.getTypes().arrangeCXXMethodCall( - Args, FPT, CallInfo.ReqArgs, CallInfo.PrefixSize, - getCurrentFunctionDecl()); + Args, FPT, CallInfo.ReqArgs, CallInfo.PrefixSize); return EmitCall(FnInfo, Callee, ReturnValue, Args, CallOrInvoke, CE && CE == MustTailCall, CE ? CE->getExprLoc() : SourceLocation()); @@ -495,8 +494,7 @@ CodeGenFunction::EmitCXXMemberPointerCallExpr(const CXXMemberCallExpr *E, // And the rest of the call args EmitCallArgs(Args, FPT, E->arguments()); return EmitCall(CGM.getTypes().arrangeCXXMethodCall(Args, FPT, required, - /*PrefixSize=*/0, - getCurrentFunctionDecl()), + /*PrefixSize=*/0), Callee, ReturnValue, Args, CallOrInvoke, E == MustTailCall, E->getExprLoc()); } @@ -1356,10 +1354,9 @@ static RValue EmitNewDeleteCall(CodeGenFunction &CGF, llvm::Constant *CalleePtr = CalleeOverride ? CalleeOverride : CGF.CGM.GetAddrOfFunction(CalleeDecl); CGCallee Callee = CGCallee::forDirect(CalleePtr, GlobalDecl(CalleeDecl)); - RValue RV = CGF.EmitCall( - CGF.CGM.getTypes().arrangeFreeFunctionCall( - Args, CalleeType, /*ChainCall=*/false, CGF.getCurrentFunctionDecl()), - Callee, ReturnValueSlot(), Args, &CallOrInvoke); + RValue RV = CGF.EmitCall(CGF.CGM.getTypes().arrangeFreeFunctionCall( + Args, CalleeType, /*ChainCall=*/false), + Callee, ReturnValueSlot(), Args, &CallOrInvoke); /// C++1y [expr.new]p10: /// [In a new-expression,] an implementation is allowed to omit a call diff --git a/clang/lib/CodeGen/CGExprComplex.cpp b/clang/lib/CodeGen/CGExprComplex.cpp index 350cbd18c7ed7..4d98ee9957418 100644 --- a/clang/lib/CodeGen/CGExprComplex.cpp +++ b/clang/lib/CodeGen/CGExprComplex.cpp @@ -782,8 +782,7 @@ ComplexPairTy ComplexExprEmitter::EmitComplexBinOpLibCall(StringRef LibCallName, 4, Op.Ty->castAs<ComplexType>()->getElementType()); QualType FQTy = CGF.getContext().getFunctionType(Op.Ty, ArgsQTys, EPI); const CGFunctionInfo &FuncInfo = CGF.CGM.getTypes().arrangeFreeFunctionCall( - Args, cast<FunctionType>(FQTy.getTypePtr()), false, - CGF.getCurrentFunctionDecl()); + Args, cast<FunctionType>(FQTy.getTypePtr()), false); llvm::FunctionType *FTy = CGF.CGM.getTypes().GetFunctionType(FuncInfo); llvm::FunctionCallee Func = CGF.CGM.CreateRuntimeFunction( diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp index ea5c1a24d726e..8794579166b6a 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.cpp +++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp @@ -402,10 +402,8 @@ static void callResourceInitMethod(CodeGenFunction &CGF, llvm::Constant *CalleeFn = CGF.CGM.GetAddrOfFunction(CreateMethod); const FunctionProtoType *Proto = CreateMethod->getType()->getAs<FunctionProtoType>(); - // HLSL code generation is restricted to DXIL and SPIR-V targets, so no - // caller declaration is needed for x86 SysV ABI selection. - const CGFunctionInfo &FnInfo = CGF.CGM.getTypes().arrangeFreeFunctionCall( - Args, Proto, false, /*ABIInfoFD=*/nullptr); + const CGFunctionInfo &FnInfo = + CGF.CGM.getTypes().arrangeFreeFunctionCall(Args, Proto, false); ReturnValueSlot ReturnValue(ReturnAddress, false); CGCallee Callee(CGCalleeInfo(Proto), CalleeFn); CGF.EmitCall(FnInfo, Callee, ReturnValue, Args, nullptr); diff --git a/clang/lib/CodeGen/CGObjCRuntime.cpp b/clang/lib/CodeGen/CGObjCRuntime.cpp index a83a4ce67a9c6..2b8bd170b7197 100644 --- a/clang/lib/CodeGen/CGObjCRuntime.cpp +++ b/clang/lib/CodeGen/CGObjCRuntime.cpp @@ -364,15 +364,13 @@ CGObjCRuntime::getMessageSendInfo(const ObjCMethodDecl *method, llvm::PointerType *signatureType = llvm::PointerType::get(CGM.getLLVMContext(), ProgramAS); - // FIXME: Pass the enclosing FunctionDecl so Objective-C message sends use - // the caller's target features when arranging their ABI. // If there's a method, use information from that. if (method) { const CGFunctionInfo &signature = CGM.getTypes().arrangeObjCMessageSendSignature(method, callArgs[0].Ty); const CGFunctionInfo &signatureForCall = - CGM.getTypes().arrangeCall(signature, callArgs, /*ABIInfoFD=*/nullptr); + CGM.getTypes().arrangeCall(signature, callArgs); return MessageSendInfo(signatureForCall, signatureType); } diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index f8cea57739949..9e4218646669c 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -383,12 +383,10 @@ void CodeGenFunction::EmitCallAndReturnForThunk(llvm::FunctionCallee Callee, #ifndef NDEBUG const CGFunctionInfo &CallFnInfo = CGM.getTypes().arrangeCXXMethodCall( - CallArgs, FPT, RequiredArgs::forPrototypePlus(FPT, 1), PrefixArgs, MD); + CallArgs, FPT, RequiredArgs::forPrototypePlus(FPT, 1), PrefixArgs); assert(CallFnInfo.getRegParm() == CurFnInfo->getRegParm() && CallFnInfo.isNoReturn() == CurFnInfo->isNoReturn() && - CallFnInfo.getCallingConvention() == - CurFnInfo->getCallingConvention() && - CallFnInfo.getX86ABIAVXLevel() == CurFnInfo->getX86ABIAVXLevel()); + CallFnInfo.getCallingConvention() == CurFnInfo->getCallingConvention()); assert(isa<CXXDestructorDecl>(MD) || // ignore dtor return types similar(CallFnInfo.getReturnInfo(), CallFnInfo.getReturnType(), CurFnInfo->getReturnInfo(), CurFnInfo->getReturnType())); diff --git a/clang/lib/CodeGen/CodeGenABITypes.cpp b/clang/lib/CodeGen/CodeGenABITypes.cpp index a2f4c6fd9a26a..aad286f3de53c 100644 --- a/clang/lib/CodeGen/CodeGenABITypes.cpp +++ b/clang/lib/CodeGen/CodeGenABITypes.cpp @@ -60,20 +60,20 @@ CodeGen::arrangeCXXMethodType(CodeGenModule &CGM, const CGFunctionInfo &CodeGen::arrangeCXXMethodCall( CodeGenModule &CGM, CanQualType returnType, ArrayRef<CanQualType> argTypes, FunctionType::ExtInfo info, - ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, RequiredArgs args, - const FunctionDecl *CallerFD) { + ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, + RequiredArgs args) { return CGM.getTypes().arrangeLLVMFunctionInfo( returnType, FnInfoOpts::IsInstanceMethod, argTypes, info, paramInfos, - args, CallerFD); + args); } const CGFunctionInfo &CodeGen::arrangeFreeFunctionCall( CodeGenModule &CGM, CanQualType returnType, ArrayRef<CanQualType> argTypes, FunctionType::ExtInfo info, - ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, RequiredArgs args, - const FunctionDecl *CallerFD) { + ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, + RequiredArgs args) { return CGM.getTypes().arrangeLLVMFunctionInfo( - returnType, FnInfoOpts::None, argTypes, info, paramInfos, args, CallerFD); + returnType, FnInfoOpts::None, argTypes, info, paramInfos, args); } ImplicitCXXConstructorArgs diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index e1645fc06ed5a..fc4c7ea40f03d 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -91,13 +91,6 @@ CodeGenFunction::CodeGenFunction(CodeGenModule &cgm, bool suppressNewContext) SetFastMathFlags(CurFPFeatures); } -const FunctionDecl *CodeGenFunction::getCurrentFunctionDecl() const { - const auto *FD = dyn_cast_or_null<FunctionDecl>(CurCodeDecl); - if (!FD) - FD = dyn_cast_or_null<FunctionDecl>(CurFuncDecl); - return FD; -} - CodeGenFunction::~CodeGenFunction() { assert(LifetimeExtendedCleanupStack.empty() && "failed to emit a cleanup"); assert(DeferredDeactivationCleanupStack.empty() && @@ -1622,7 +1615,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, const FunctionType *FT = cast<FunctionType>(FD->getType()); CGM.getTargetCodeGenInfo().setOCLKernelStubCallingConvention(FT); const CGFunctionInfo &FnInfo = CGM.getTypes().arrangeFreeFunctionCall( - CallArgs, FT, /*ChainCall=*/false, getCurrentFunctionDecl()); + CallArgs, FT, /*ChainCall=*/false); llvm::FunctionType *FTy = CGM.getTypes().GetFunctionType(FnInfo); llvm::Constant *GDStubFunctionPointer = CGM.getRawFunctionPointer(GDStub, FTy); diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 3fc9052adb87b..e7c24f1f36f1e 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -2236,7 +2236,6 @@ class CodeGenFunction : public CodeGenTypeCache { const TargetCodeGenInfo &getTargetHooks() const { return CGM.getTargetCodeGenInfo(); } - const FunctionDecl *getCurrentFunctionDecl() const; //===--------------------------------------------------------------------===// // Cleanups diff --git a/clang/lib/CodeGen/CodeGenTypes.h b/clang/lib/CodeGen/CodeGenTypes.h index 860f1f1ccdce2..9de7e0a83579d 100644 --- a/clang/lib/CodeGen/CodeGenTypes.h +++ b/clang/lib/CodeGen/CodeGenTypes.h @@ -33,7 +33,6 @@ template <typename> class CanQual; class CXXConstructorDecl; class CXXMethodDecl; class CodeGenOptions; -class FunctionDecl; class FunctionProtoType; class QualType; class RecordDecl; @@ -90,18 +89,9 @@ class CodeGenTypes { llvm::DenseMap<const Type *, llvm::Type *> RecordsWithOpaqueMemberPointers; static constexpr unsigned FunctionInfosLog2InitSize = 9; - /// Helper for ConvertType. llvm::Type *ConvertFunctionTypeInternal(QualType FT); - // Helper to insert CGFunctionInfo objects - CGFunctionInfo *findOrInsertCGFunctionInfo( - bool isInstanceMethod, bool isChainCall, bool isDelegateCall, - unsigned X86ABIAVXLevel, const FunctionType::ExtInfo &info, - ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, - RequiredArgs required, CanQualType resultType, - ArrayRef<CanQualType> argTypes); - public: CodeGenTypes(CodeGenModule &cgm); ~CodeGenTypes(); @@ -213,16 +203,14 @@ class CodeGenTypes { /// /// Often this will be able to simply return the declaration info. const CGFunctionInfo &arrangeCall(const CGFunctionInfo &declFI, - const CallArgList &args, - const FunctionDecl *ABIInfoFD); + const CallArgList &args); /// Free functions are functions that are compatible with an ordinary /// C function pointer type. const CGFunctionInfo &arrangeFunctionDeclaration(const GlobalDecl GD); const CGFunctionInfo &arrangeFreeFunctionCall(const CallArgList &Args, const FunctionType *Ty, - bool ChainCall, - const FunctionDecl *ABIInfoFD); + bool ChainCall); const CGFunctionInfo &arrangeFreeFunctionType(CanQual<FunctionProtoType> Ty); const CGFunctionInfo &arrangeFreeFunctionType(CanQual<FunctionNoProtoType> Ty); @@ -252,9 +240,9 @@ class CodeGenTypes { const CGFunctionInfo &arrangeObjCMethodDeclaration(const ObjCMethodDecl *MD); const CGFunctionInfo &arrangeObjCMessageSendSignature(const ObjCMethodDecl *MD, QualType receiverType); - const CGFunctionInfo & - arrangeUnprototypedObjCMessageSend(QualType returnType, - const CallArgList &args); + const CGFunctionInfo &arrangeUnprototypedObjCMessageSend( + QualType returnType, + const CallArgList &args); /// Block invocation functions are C functions with an implicit parameter. const CGFunctionInfo &arrangeBlockFunctionDeclaration( @@ -266,16 +254,17 @@ class CodeGenTypes { /// C++ methods have some special rules and also have implicit parameters. const CGFunctionInfo &arrangeCXXMethodDeclaration(const CXXMethodDecl *MD); const CGFunctionInfo &arrangeCXXStructorDeclaration(GlobalDecl GD); - const CGFunctionInfo &arrangeCXXConstructorCall( - const CallArgList &Args, const CXXConstructorDecl *D, - CXXCtorType CtorKind, unsigned ExtraPrefixArgs, unsigned ExtraSuffixArgs, - const FunctionDecl *ABIInfoFD, bool PassProtoArgs = true); + const CGFunctionInfo &arrangeCXXConstructorCall(const CallArgList &Args, + const CXXConstructorDecl *D, + CXXCtorType CtorKind, + unsigned ExtraPrefixArgs, + unsigned ExtraSuffixArgs, + bool PassProtoArgs = true); const CGFunctionInfo &arrangeCXXMethodCall(const CallArgList &args, const FunctionProtoType *type, RequiredArgs required, - unsigned numPrefixArgs, - const FunctionDecl *ABIInfoFD); + unsigned numPrefixArgs); const CGFunctionInfo & arrangeUnprototypedMustTailThunk(const CXXMethodDecl *MD); const CGFunctionInfo &arrangeMSCtorClosure(const CXXConstructorDecl *CD, @@ -294,7 +283,7 @@ class CodeGenTypes { CanQualType returnType, FnInfoOpts opts, ArrayRef<CanQualType> argTypes, FunctionType::ExtInfo info, ArrayRef<FunctionProtoType::ExtParameterInfo> paramInfos, - RequiredArgs args, const FunctionDecl *ABIInfoFD); + RequiredArgs args); /// Compute a new LLVM record layout object for the given record. std::unique_ptr<CGRecordLayout> ComputeRecordLayout(const RecordDecl *D, diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp b/clang/lib/CodeGen/ItaniumCXXABI.cpp index 5c5fefe32c06c..b17478cb7ffde 100644 --- a/clang/lib/CodeGen/ItaniumCXXABI.cpp +++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp @@ -3530,7 +3530,7 @@ ItaniumCXXABI::getOrCreateVirtualFunctionPointerThunk(const CXXMethodDecl *MD) { const FunctionProtoType *FPT = MD->getType()->getAs<FunctionProtoType>(); RequiredArgs Required = RequiredArgs::forPrototypePlus(FPT, /*this*/ 1); const CGFunctionInfo &CallInfo = - CGM.getTypes().arrangeCXXMethodCall(CallArgs, FPT, Required, 0, MD); + CGM.getTypes().arrangeCXXMethodCall(CallArgs, FPT, Required, 0); CGCallee Callee = CGCallee::forVirtual(nullptr, GlobalDecl(MD), getThisAddress(CGF), ThunkTy); llvm::CallBase *CallOrInvoke; diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index 8b43dd887573d..d324580036f6a 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -4229,12 +4229,8 @@ MicrosoftCXXABI::getAddrOfCXXCtorClosure(const CXXConstructorDecl *CD, CGM.getAddrOfCXXStructor(GlobalDecl(CD, Ctor_Complete)); CGCallee Callee = CGCallee::forDirect(CalleePtr, GlobalDecl(CD, Ctor_Complete)); - // Microsoft ABI constructors always use the default method calling - // convention (see SemaType.cpp adjustMemberFunctionCC), so no caller - // declaration is needed for SysV ABI selection. const CGFunctionInfo &CalleeInfo = CGM.getTypes().arrangeCXXConstructorCall( - Args, CD, Ctor_Complete, ExtraArgs.Prefix, ExtraArgs.Suffix, - /*ABIInfoFD=*/nullptr); + Args, CD, Ctor_Complete, ExtraArgs.Prefix, ExtraArgs.Suffix); CGF.EmitCall(CalleeInfo, Callee, ReturnValueSlot(), Args); Cleanups.ForceCleanup(); diff --git a/clang/lib/CodeGen/Targets/X86.cpp b/clang/lib/CodeGen/Targets/X86.cpp index 7c71ed9b34e83..807d372c3c8fd 100644 --- a/clang/lib/CodeGen/Targets/X86.cpp +++ b/clang/lib/CodeGen/Targets/X86.cpp @@ -1385,8 +1385,6 @@ class X86_64ABIInfo : public ABIInfo { } void computeInfo(CGFunctionInfo &FI) const override; - unsigned getX86ABIAVXLevel(const FunctionDecl *FD, - const FunctionType::ExtInfo &Info) const override; RValue EmitVAArg(CodeGenFunction &CGF, Address VAListAddr, QualType Ty, AggValueSlot Slot) const override; @@ -1406,8 +1404,6 @@ class WinX86_64ABIInfo : public ABIInfo { IsMingw64(getTarget().getTriple().isWindowsGNUEnvironment()) {} void computeInfo(CGFunctionInfo &FI) const override; - unsigned getX86ABIAVXLevel(const FunctionDecl *FD, - const FunctionType::ExtInfo &Info) const override; RValue EmitVAArg(CodeGenFunction &CGF, Address VAListAddr, QualType Ty, AggValueSlot Slot) const override; @@ -1826,29 +1822,6 @@ void X86_64ABIInfo::postMerge(unsigned AggregateSize, Class &Lo, Hi = SSE; } -static X86AVXABILevel getEffectiveX86AVXABILevel(CodeGenTypes &CGT, - X86AVXABILevel GlobalAVXLevel, - const FunctionDecl *FD) { - // Always return global AVX level on PlayStation. - if (CGT.getTarget().getTriple().isPS() || - CGT.getContext().getLangOpts().getClangABICompat() <= - LangOptions::ClangABI::Ver23) { - return GlobalAVXLevel; - } - - X86AVXABILevel Level = GlobalAVXLevel; - if (!FD) - return Level; - - llvm::StringMap<bool> FeatureMap; - CGT.getCGM().getContext().getFunctionFeatureMap(FeatureMap, FD); - if (FeatureMap.lookup("avx512f")) - return std::max(Level, X86AVXABILevel::AVX512); - if (FeatureMap.lookup("avx")) - return std::max(Level, X86AVXABILevel::AVX); - return Level; -} - X86_64ABIInfo::Class X86_64ABIInfo::merge(Class Accum, Class Field) { // AMD64-ABI 3.2.3p2: Rule 4. Each field of an object is // classified recursively so that always two fields are @@ -3051,13 +3024,8 @@ X86_64ABIInfo::classifyRegCallStructType(QualType Ty, unsigned &NeededInt, llvm::StructType::get(getVMContext(), CoerceElts)); } -unsigned -X86_64ABIInfo::getX86ABIAVXLevel(const FunctionDecl *FD, - const FunctionType::ExtInfo &Info) const { - return static_cast<unsigned>(getEffectiveX86AVXABILevel(CGT, AVXLevel, FD)); -} - void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const { + const unsigned CallingConv = FI.getCallingConvention(); // It is possible to force Win64 calling convention on any x86_64 target by // using __attribute__((ms_abi)). In such case to correctly emit Win64 @@ -3068,17 +3036,6 @@ void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const { return; } - assert(FI.getX86ABIAVXLevel() <= - static_cast<unsigned>(X86AVXABILevel::AVX512) && - "Unexpected X86 AVX ABI level"); - X86AVXABILevel EffectiveAVXLevel = - static_cast<X86AVXABILevel>(FI.getX86ABIAVXLevel()); - if (EffectiveAVXLevel != AVXLevel) { - X86_64ABIInfo EffectiveABIInfo(CGT, EffectiveAVXLevel); - EffectiveABIInfo.computeInfo(FI); - return; - } - bool IsRegCall = CallingConv == llvm::CallingConv::X86_RegCall; // Keep track of the number of assigned registers. @@ -3601,16 +3558,6 @@ ABIArgInfo WinX86_64ABIInfo::classify(QualType Ty, unsigned &FreeSSERegs, return ABIArgInfo::getDirect(); } -unsigned -WinX86_64ABIInfo::getX86ABIAVXLevel(const FunctionDecl *FD, - const FunctionType::ExtInfo &Info) const { - if (Info.getCC() == CC_X86_64SysV) { - return static_cast<unsigned>(getEffectiveX86AVXABILevel(CGT, AVXLevel, FD)); - } - - return static_cast<unsigned>(AVXLevel); -} - void WinX86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const { const unsigned CC = FI.getCallingConvention(); bool IsVectorCall = CC == llvm::CallingConv::X86_VectorCall; diff --git a/clang/test/CodeGen/sysv_abi.c b/clang/test/CodeGen/sysv_abi.c index 81d2b26a09629..a66ecc6e26242 100644 --- a/clang/test/CodeGen/sysv_abi.c +++ b/clang/test/CodeGen/sysv_abi.c @@ -53,21 +53,3 @@ void use_vectors(void) { // NOAVX: call {{(x86_64_sysvcc )?}}void @take_m256(ptr noundef byval(<8 x float>) align 32 %{{.*}}) // NOAVX: call {{(x86_64_sysvcc )?}}<16 x float> @get_m512() // NOAVX: call {{(x86_64_sysvcc )?}}void @take_m512(ptr noundef byval(<16 x float>) align 64 %{{.*}}) - -// Added test to explicitly cover the case when __attribute__((target("avx"))) is used -// with __attribute__((sysv_abi)) - -__attribute__((target("avx"))) my_m256 SYSV_CC get_avx_m256(void); -__attribute__((target("avx"))) void SYSV_CC take_avx_m256(my_m256); - -__attribute__((target("avx"))) -void use_target_attr_vectors(void) { - my_m256 v = get_avx_m256(); - take_avx_m256(v); -} - -// CHECK: define {{(dso_local )?}}void @use_target_attr_vectors() -// AVX: call {{(x86_64_sysvcc )?}}<8 x float> @get_avx_m256() -// AVX: call {{(x86_64_sysvcc )?}}void @take_avx_m256(<8 x float> noundef %{{.*}}) -// NOAVX: call {{(x86_64_sysvcc )?}}<8 x float> @get_avx_m256() -// NOAVX: call {{(x86_64_sysvcc )?}}void @take_avx_m256(<8 x float> noundef %{{.*}}) diff --git a/clang/test/CodeGen/target-avx-function-abi.c b/clang/test/CodeGen/target-avx-function-abi.c deleted file mode 100644 index 6ea0fd39a29f1..0000000000000 --- a/clang/test/CodeGen/target-avx-function-abi.c +++ /dev/null @@ -1,71 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=SYSV -// RUN: %clang_cc1 -triple x86_64-scei-ps4 -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=PS -// RUN: %clang_cc1 -triple x86_64-sie-ps5 -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=PS - -typedef float v8f __attribute__((vector_size(32))); -typedef float v16f __attribute__((vector_size(64))); - -v8f g256(v8f x) { return x; } -v16f g512(v16f x) { return x; } - -__attribute__((target("avx"))) v8f l256(v8f x) { return x; } -__attribute__((target("avx512f"))) v16f l512(v16f x) { return x; } - -__attribute__((target("avx"))) v8f call_l256(v8f x) { return l256(x); } -__attribute__((target("avx512f"))) v16f call_l512(v16f x) { return l512(x); } - -__attribute__((target("avx"))) v8f call_ptr_l256(v8f x) { - v8f (*fp)(v8f) = l256; - return fp(x); -} - -__attribute__((target("avx512f"))) v16f call_ptr_l512(v16f x) { - v16f (*fp)(v16f) = l512; - return fp(x); -} - -// SYSV-LABEL: define dso_local <8 x float> @g256( -// SYSV: byval(<8 x float>) align 32 - -// SYSV-LABEL: define dso_local <16 x float> @g512( -// SYSV: byval(<16 x float>) align 64 - -// SYSV-LABEL: define dso_local <8 x float> @l256(<8 x float> noundef %x) -// SYSV-LABEL: define dso_local <16 x float> @l512(<16 x float> noundef %x) - -// SYSV-LABEL: define dso_local <8 x float> @call_l256(<8 x float> noundef %x) -// SYSV: call <8 x float> @l256(<8 x float> noundef - -// SYSV-LABEL: define dso_local <16 x float> @call_l512(<16 x float> noundef %x) -// SYSV: call <16 x float> @l512(<16 x float> noundef - -// SYSV-LABEL: define dso_local <8 x float> @call_ptr_l256(<8 x float> noundef %x) -// SYSV: call <8 x float> %{{.*}}(<8 x float> noundef - -// SYSV-LABEL: define dso_local <16 x float> @call_ptr_l512(<16 x float> noundef %x) -// SYSV: call <16 x float> %{{.*}}(<16 x float> noundef - -// PlayStation keeps the legacy ABI which always returns AVX vectors in registers & only uses AVX level from module/TU level even with AVX target attributes. -// PS-LABEL: define dso_local <8 x float> @g256( -// PS: byval(<8 x float>) align 32 - -// PS-LABEL: define dso_local <16 x float> @g512( -// PS: byval(<16 x float>) align 64 - -// PS-LABEL: define dso_local <8 x float> @l256( -// PS: byval(<8 x float>) align 32 - -// PS-LABEL: define dso_local <16 x float> @l512( -// PS: byval(<16 x float>) align 64 - -// PS-LABEL: define dso_local <8 x float> @call_l256( -// PS: call <8 x float> @l256(ptr noundef byval(<8 x float>) align 32 - -// PS-LABEL: define dso_local <16 x float> @call_l512( -// PS: call <16 x float> @l512(ptr noundef byval(<16 x float>) align 64 - -// PS-LABEL: define dso_local <8 x float> @call_ptr_l256( -// PS: call <8 x float> %{{.*}}(ptr noundef byval(<8 x float>) align 32 - -// PS-LABEL: define dso_local <16 x float> @call_ptr_l512( -// PS: call <16 x float> %{{.*}}(ptr noundef byval(<16 x float>) align 64 diff --git a/clang/test/CodeGenCXX/target-avx-method-abi.cpp b/clang/test/CodeGenCXX/target-avx-method-abi.cpp deleted file mode 100644 index 47bd1d3ca8c83..0000000000000 --- a/clang/test/CodeGenCXX/target-avx-method-abi.cpp +++ /dev/null @@ -1,121 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=SYSV -// RUN: %clang_cc1 -triple x86_64-scei-ps4 -std=c++20 -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=PS -// RUN: %clang_cc1 -triple x86_64-sie-ps5 -std=c++20 -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=PS - -typedef float v8f __attribute__((vector_size(32))); -typedef float v16f __attribute__((vector_size(64))); - -struct S { - __attribute__((target("avx"))) - v8f m(v8f x) { return x; } -}; - -struct C { - v8f field; - __attribute__((target("avx"))) - C(v8f x) : field(x) {} -}; - -__attribute__((target("avx"))) -v8f callm(S *s, v8f x) { - return s->m(x); -} - -__attribute__((target("avx"))) -v8f callctor(v8f x) { - C c(x); - return c.field; -} - -__attribute__((target("avx"))) -v8f callm_ptr(S *s, v8f x) { - v8f (S::*pmf)(v8f) = &S::m; - return (s->*pmf)(x); -} - -struct S512 { - __attribute__((target("avx512f"))) - v16f m512(v16f x) { return x; } -}; - -struct D512 { - v16f field; - __attribute__((target("avx512f"))) - D512(v16f x) : field(x) {} -}; - -__attribute__((target("avx512f"))) -v16f callm512(S512 *s, v16f x) { - return s->m512(x); -} - -__attribute__((target("avx512f"))) -v16f callctor512(v16f x) { - D512 c(x); - return c.field; -} - -__attribute__((target("avx512f"))) -v16f callm512_ptr(S512 *s, v16f x) { - v16f (S512::*pmf)(v16f) = &S512::m512; - return (s->*pmf)(x); -} - -// Desired ABI behavior: AVX-targeted member functions should pass/return AVX -// vectors directly, just like AVX-targeted free functions. -// SYSV-LABEL: define dso_local noundef <8 x float> @_Z5callmP1SDv8_f( -// SYSV: call noundef <8 x float> @_ZN1S1mEDv8_f(ptr noundef -// SYSV-LABEL: define linkonce_odr noundef <8 x float> @_ZN1S1mEDv8_f( -// SYSV-SAME: ptr noundef nonnull align 1 dereferenceable(1) %this, <8 x float> noundef %x) -// SYSV-LABEL: define dso_local noundef <8 x float> @_Z8callctorDv8_f( -// SYSV: call void @_ZN1CC1EDv8_f(ptr noundef nonnull align 32 dereferenceable(32) -// SYSV-SAME: <8 x float> noundef -// SYSV-LABEL: define linkonce_odr void @_ZN1CC1EDv8_f( -// SYSV-SAME: ptr noundef nonnull align 32 dereferenceable(32) %this, <8 x float> noundef %x) -// SYSV-LABEL: define dso_local noundef <8 x float> @_Z9callm_ptrP1SDv8_f( -// SYSV-SAME: ptr noundef %s, <8 x float> noundef %x) -// SYSV: call noundef <8 x float> %{{.*}}(ptr noundef nonnull align 1 dereferenceable(1) %{{.*}}, <8 x float> noundef -// SYSV-LABEL: define dso_local noundef <16 x float> @_Z8callm512P4S512Dv16_f( -// SYSV: call noundef <16 x float> @_ZN4S5124m512EDv16_f(ptr noundef -// SYSV-LABEL: define linkonce_odr noundef <16 x float> @_ZN4S5124m512EDv16_f( -// SYSV-SAME: ptr noundef nonnull align 1 dereferenceable(1) %this, <16 x float> noundef %x) -// SYSV-LABEL: define dso_local noundef <16 x float> @_Z11callctor512Dv16_f( -// SYSV: call void @_ZN4D512C1EDv16_f(ptr noundef nonnull align 64 dereferenceable(64) -// SYSV-SAME: <16 x float> noundef -// SYSV-LABEL: define linkonce_odr void @_ZN4D512C1EDv16_f( -// SYSV-SAME: ptr noundef nonnull align 64 dereferenceable(64) %this, <16 x float> noundef %x) -// SYSV-LABEL: define dso_local noundef <16 x float> @_Z12callm512_ptrP4S512Dv16_f( -// SYSV-SAME: ptr noundef %s, <16 x float> noundef %x) -// SYSV: call noundef <16 x float> %{{.*}}(ptr noundef nonnull align 1 dereferenceable(1) %{{.*}}, <16 x float> noundef -// SYSV-LABEL: define linkonce_odr void @_ZN1CC2EDv8_f( -// SYSV-SAME: ptr noundef nonnull align 32 dereferenceable(32) %this, <8 x float> noundef %x) -// SYSV-LABEL: define linkonce_odr void @_ZN4D512C2EDv16_f( -// SYSV-SAME: ptr noundef nonnull align 64 dereferenceable(64) %this, <16 x float> noundef %x) - -// PlayStation keeps the legacy ABI which always returns AVX vectors in registers & only uses AVX level from module/TU level even with AVX target attributes. -// PS-LABEL: define dso_local noundef <8 x float> @_Z5callmP1SDv8_f( -// PS: byval(<8 x float>) align 32 -// PS: call noundef <8 x float> @_ZN1S1mEDv8_f( -// PS-LABEL: define linkonce_odr noundef <8 x float> @_ZN1S1mEDv8_f( -// PS: byval(<8 x float>) align 32 -// PS-LABEL: define dso_local noundef <8 x float> @_Z8callctorDv8_f( -// PS-LABEL: define linkonce_odr void @_ZN1CC1EDv8_f( -// PS-SAME: ptr noundef nonnull align 32 dereferenceable(32) %this, ptr noundef byval(<8 x float>) align 32 -// PS-LABEL: define dso_local noundef <8 x float> @_Z9callm_ptrP1SDv8_f( -// PS-SAME: ptr noundef %s, ptr noundef byval(<8 x float>) align 32 -// PS: call noundef <8 x float> %{{.*}}(ptr noundef nonnull align 1 dereferenceable(1) %{{.*}}, ptr noundef byval(<8 x float>) align 32 -// PS-LABEL: define dso_local noundef <16 x float> @_Z8callm512P4S512Dv16_f( -// PS: byval(<16 x float>) align 64 -// PS: call noundef <16 x float> @_ZN4S5124m512EDv16_f( -// PS-LABEL: define linkonce_odr noundef <16 x float> @_ZN4S5124m512EDv16_f( -// PS: byval(<16 x float>) align 64 -// PS-LABEL: define dso_local noundef <16 x float> @_Z11callctor512Dv16_f( -// PS-LABEL: define linkonce_odr void @_ZN4D512C1EDv16_f( -// PS-SAME: ptr noundef nonnull align 64 dereferenceable(64) %this, ptr noundef byval(<16 x float>) align 64 -// PS-LABEL: define dso_local noundef <16 x float> @_Z12callm512_ptrP4S512Dv16_f( -// PS-SAME: ptr noundef %s, ptr noundef byval(<16 x float>) align 64 -// PS: call noundef <16 x float> %{{.*}}(ptr noundef nonnull align 1 dereferenceable(1) %{{.*}}, ptr noundef byval(<16 x float>) align 64 -// PS-LABEL: define linkonce_odr void @_ZN1CC2EDv8_f( -// PS-SAME: ptr noundef nonnull align 32 dereferenceable(32) %this, ptr noundef byval(<8 x float>) align 32 -// PS-LABEL: define linkonce_odr void @_ZN4D512C2EDv16_f( -// PS-SAME: ptr noundef nonnull align 64 dereferenceable(64) %this, ptr noundef byval(<16 x float>) align 64 diff --git a/clang/unittests/CodeGen/CodeGenExternalTest.cpp b/clang/unittests/CodeGen/CodeGenExternalTest.cpp index b98f6c513548f..8824451ccc2f4 100644 --- a/clang/unittests/CodeGen/CodeGenExternalTest.cpp +++ b/clang/unittests/CodeGen/CodeGenExternalTest.cpp @@ -11,7 +11,6 @@ #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" #include "clang/AST/BaseSubobject.h" -#include "clang/AST/Decl.h" #include "clang/AST/GlobalDecl.h" #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Basic/TargetInfo.h" @@ -45,10 +44,8 @@ static const bool DebugThisTest = false; // forward declarations struct MyASTConsumer; -static void test_generic_codegen_fns(MyASTConsumer *my); -static void test_x86_avx_abi_codegen_fns(MyASTConsumer *my); -static bool test_generic_codegen_fns_ran; -static bool test_x86_avx_abi_codegen_fns_ran; +static void test_codegen_fns(MyASTConsumer *my); +static bool test_codegen_fns_ran; // This forwards the calls to the Clang CodeGenerator // so that we can test CodeGen functions while it is open. @@ -57,15 +54,13 @@ static bool test_x86_avx_abi_codegen_fns_ran; // before forwarding that function to the CodeGenerator. struct MyASTConsumer : public ASTConsumer { - using TestFn = void (*)(MyASTConsumer *); - std::unique_ptr<CodeGenerator> Builder; - TestFn TestFunction; std::vector<Decl*> toplevel_decls; - MyASTConsumer(std::unique_ptr<CodeGenerator> Builder_in, TestFn TestFunction) - : ASTConsumer(), Builder(std::move(Builder_in)), - TestFunction(TestFunction) {} + MyASTConsumer(std::unique_ptr<CodeGenerator> Builder_in) + : ASTConsumer(), Builder(std::move(Builder_in)) + { + } ~MyASTConsumer() { } @@ -111,7 +106,7 @@ void MyASTConsumer::HandleInterestingDecl(DeclGroupRef D) { } void MyASTConsumer::HandleTranslationUnit(ASTContext &Context) { - TestFunction(this); + test_codegen_fns(this); // HandleTranslationUnit can close the module Builder->HandleTranslationUnit(Context); } @@ -168,7 +163,7 @@ bool MyASTConsumer::shouldSkipFunctionBody(Decl *D) { return Builder->shouldSkipFunctionBody(D); } -const char GenericTestProgram[] = +const char TestProgram[] = "struct mytest_struct { char x; short y; char p; long z; };\n" "int mytest_fn(int x) { return x; }\n" "struct mytest_dynamic_struct {\n" @@ -177,27 +172,9 @@ const char GenericTestProgram[] = "};\n" "mytest_dynamic_struct::mytest_dynamic_struct() { }\n"; -const char X86AVXABITestProgram[] = - "typedef float mytest_v8f __attribute__((vector_size(32)));\n" - "struct mytest_avx_method_holder {\n" - " __attribute__((target(\"avx\"))) mytest_v8f method(mytest_v8f x) {\n" - " return x;\n" - " }\n" - "};\n" - "__attribute__((target(\"avx\"))) mytest_v8f mytest_avx_fn(mytest_v8f x) " - "{\n" - " return x;\n" - "}\n" - "__attribute__((target(\"avx\"))) void caller() " - "{\n" - " mytest_v8f hello = {1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0};\n" - " mytest_avx_fn(hello);\n" - " mytest_avx_method_holder holder = mytest_avx_method_holder();\n" - " holder.method(hello);\n" - "}\n" - "__attribute__((target(\"avx\"))) void caller2() {}\n"; - -static void test_generic_codegen_fns(MyASTConsumer *my) { +// This function has the real test code here +static void test_codegen_fns(MyASTConsumer *my) { + bool mytest_fn_ok = false; bool mytest_struct_ok = false; @@ -304,81 +281,7 @@ static void test_generic_codegen_fns(MyASTConsumer *my) { ASSERT_TRUE(mytest_fn_ok); ASSERT_TRUE(mytest_struct_ok); - test_generic_codegen_fns_ran = true; -} - -static void test_x86_avx_abi_codegen_fns(MyASTConsumer *my) { - bool mytest_avx_fn_ok = false; - bool mytest_avx_method_ok = false; - - CodeGen::CodeGenModule &CGM = my->Builder->CGM(); - const ASTContext &Ctx = my->toplevel_decls.front()->getASTContext(); - - // First get the caller decls, which we need to determine call ABI. - FunctionDecl *callerDecl = nullptr; - FunctionDecl *caller2Decl = nullptr; - for (auto decl : my->toplevel_decls) { - if (FunctionDecl *fd = dyn_cast<FunctionDecl>(decl)) { - if (fd->getName() == "caller") - callerDecl = fd; - else if (fd->getName() == "caller2") - caller2Decl = fd; - } - } - ASSERT_TRUE(callerDecl); - ASSERT_TRUE(caller2Decl); - ASSERT_NE(callerDecl, caller2Decl); - - for (auto decl : my->toplevel_decls) { - if (FunctionDecl *fd = dyn_cast<FunctionDecl>(decl)) { - if (fd->getName() != "mytest_avx_fn") - continue; - - const auto *FPT = fd->getType()->castAs<FunctionProtoType>(); - SmallVector<CanQualType, 4> ArgTypes; - for (const ParmVarDecl *Param : fd->parameters()) - ArgTypes.push_back(Ctx.getCanonicalParamType(Param->getType())); - - const CodeGen::CGFunctionInfo &FnInfo = CodeGen::arrangeFreeFunctionCall( - CGM, Ctx.getCanonicalType(FPT->getReturnType()), ArgTypes, - FPT->getExtInfo(), {}, - CodeGen::RequiredArgs::forPrototypePlus(FPT, 0), callerDecl); - const CodeGen::CGFunctionInfo &FnInfo2 = CodeGen::arrangeFreeFunctionCall( - CGM, Ctx.getCanonicalType(FPT->getReturnType()), ArgTypes, - FPT->getExtInfo(), {}, - CodeGen::RequiredArgs::forPrototypePlus(FPT, 0), caller2Decl); - ASSERT_EQ(&FnInfo, &FnInfo2); - ASSERT_EQ(FnInfo.getX86ABIAVXLevel(), 1u); - ASSERT_TRUE(FnInfo.getReturnInfo().isDirect()); - ASSERT_TRUE(FnInfo.arg_begin()->info.isDirect()); - mytest_avx_fn_ok = true; - } else if (RecordDecl *rd = dyn_cast<RecordDecl>(decl)) { - if (rd->getName() != "mytest_avx_method_holder") - continue; - - const auto *MethodRD = cast<CXXRecordDecl>(rd->getDefinition()); - const auto *MD = cast<CXXMethodDecl>(*MethodRD->method_begin()); - const auto *FPT = MD->getType()->castAs<FunctionProtoType>(); - SmallVector<CanQualType, 4> ArgTypes; - ArgTypes.push_back(Ctx.getCanonicalParamType(MD->getThisType())); - for (const ParmVarDecl *Param : MD->parameters()) - ArgTypes.push_back(Ctx.getCanonicalParamType(Param->getType())); - - const CodeGen::CGFunctionInfo &FnInfo = CodeGen::arrangeCXXMethodCall( - CGM, Ctx.getCanonicalType(FPT->getReturnType()), ArgTypes, - FPT->getExtInfo(), {}, - CodeGen::RequiredArgs::forPrototypePlus(FPT, 1), callerDecl); - ASSERT_EQ(FnInfo.getX86ABIAVXLevel(), 1u); - ASSERT_TRUE(FnInfo.getReturnInfo().isDirect()); - ASSERT_TRUE(FnInfo.arg_begin()[1].info.isDirect()); - mytest_avx_method_ok = true; - } - } - - ASSERT_TRUE(mytest_avx_fn_ok); - ASSERT_TRUE(mytest_avx_method_ok); - - test_x86_avx_abi_codegen_fns_ran = true; + test_codegen_fns_ran = true; } TEST(CodeGenExternalTest, CodeGenExternalTest) { @@ -386,30 +289,14 @@ TEST(CodeGenExternalTest, CodeGenExternalTest) { LO.CPlusPlus = 1; LO.CPlusPlus11 = 1; TestCompiler Compiler(LO); - auto CustomASTConsumer = std::make_unique<MyASTConsumer>( - std::move(Compiler.CG), test_generic_codegen_fns); - - Compiler.init(GenericTestProgram, std::move(CustomASTConsumer)); - - clang::ParseAST(Compiler.compiler.getSema(), false, false); - - ASSERT_TRUE(test_generic_codegen_fns_ran); -} - -TEST(CodeGenExternalTest, X86AVXABIQuery) { - clang::LangOptions LO; - LO.CPlusPlus = 1; - LO.CPlusPlus11 = 1; - TestCompiler Compiler(LO, clang::CodeGenOptions(), - "x86_64-unknown-linux-gnu"); - auto CustomASTConsumer = std::make_unique<MyASTConsumer>( - std::move(Compiler.CG), test_x86_avx_abi_codegen_fns); + auto CustomASTConsumer + = std::make_unique<MyASTConsumer>(std::move(Compiler.CG)); - Compiler.init(X86AVXABITestProgram, std::move(CustomASTConsumer)); + Compiler.init(TestProgram, std::move(CustomASTConsumer)); clang::ParseAST(Compiler.compiler.getSema(), false, false); - ASSERT_TRUE(test_x86_avx_abi_codegen_fns_ran); + ASSERT_TRUE(test_codegen_fns_ran); } } // end anonymous namespace diff --git a/clang/unittests/CodeGen/TestCompiler.h b/clang/unittests/CodeGen/TestCompiler.h index 3ba839979b867..18947584bd0b3 100644 --- a/clang/unittests/CodeGen/TestCompiler.h +++ b/clang/unittests/CodeGen/TestCompiler.h @@ -33,21 +33,17 @@ struct TestCompiler { unsigned PtrSize = 0; TestCompiler(clang::LangOptions LO, - clang::CodeGenOptions CGO = clang::CodeGenOptions(), - llvm::StringRef TripleStr = "") { + clang::CodeGenOptions CGO = clang::CodeGenOptions()) { compiler.getLangOpts() = LO; compiler.getCodeGenOpts() = CGO; compiler.setVirtualFileSystem(llvm::vfs::getRealFileSystem()); compiler.createDiagnostics(); - llvm::Triple Tr(TripleStr.empty() - ? llvm::Triple::normalize(llvm::sys::getProcessTriple()) - : llvm::Triple::normalize(TripleStr)); - if (TripleStr.empty()) { - Tr.setOS(Triple::Linux); - Tr.setVendor(Triple::VendorType::UnknownVendor); - Tr.setEnvironment(Triple::EnvironmentType::UnknownEnvironment); - } + std::string TrStr = llvm::Triple::normalize(llvm::sys::getProcessTriple()); + llvm::Triple Tr(TrStr); + Tr.setOS(Triple::Linux); + Tr.setVendor(Triple::VendorType::UnknownVendor); + Tr.setEnvironment(Triple::EnvironmentType::UnknownEnvironment); compiler.getTargetOpts().Triple = Tr.getTriple(); compiler.setTarget(clang::TargetInfo::CreateTargetInfo( compiler.getDiagnostics(), compiler.getTargetOpts())); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
