llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-codegen Author: Mariya Podchishchaeva (Fznamznon) <details> <summary>Changes</summary> The max aligment that ISel and therefore LLVM Verifier accepts is 2^14. The patch also forces indirect passing and returning of vectors bigger than this limit for generic and x86_64 targets. --- Full diff: https://github.com/llvm/llvm-project/pull/98629.diff 6 Files Affected: - (modified) clang/include/clang/Basic/TargetInfo.h (+3) - (modified) clang/lib/AST/ASTContext.cpp (+2) - (modified) clang/lib/Basic/TargetInfo.cpp (+2) - (modified) clang/lib/CodeGen/ABIInfoImpl.cpp (+8) - (modified) clang/lib/CodeGen/Targets/X86.cpp (+4) - (added) clang/test/CodeGen/big-vectors.c (+17) ``````````diff diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index a58fb5f979272..5f4e5c50bf7df 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -133,6 +133,7 @@ struct TransferrableTargetInfo { unsigned short SuitableAlign; unsigned short NewAlign; unsigned MaxVectorAlign; + unsigned MaxPossibleAlign; unsigned MaxTLSAlign; const llvm::fltSemantics *HalfFormat, *BFloat16Format, *FloatFormat, @@ -848,6 +849,8 @@ class TargetInfo : public TransferrableTargetInfo, /// Return the maximum vector alignment supported for the given target. unsigned getMaxVectorAlign() const { return MaxVectorAlign; } + unsigned getMaxPossibleAlign() const { return MaxPossibleAlign; } + unsigned getMaxOpenCLWorkGroupSize() const { return MaxOpenCLWorkGroupSize; } /// Return the alignment (in bits) of the thrown exception object. This is diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 497579dcc56b6..303322a7f0032 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -1985,6 +1985,8 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const { VT->getVectorKind() == VectorKind::RVVFixedLengthMask) // Adjust the alignment for fixed-length RVV vectors. Align = std::min<unsigned>(64, Width); + else if (Target->getMaxPossibleAlign() < Align) + Align = Target->getMaxPossibleAlign(); break; } diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp index 29f5cd14e46e1..5874df93d712b 100644 --- a/clang/lib/Basic/TargetInfo.cpp +++ b/clang/lib/Basic/TargetInfo.cpp @@ -121,6 +121,8 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : Triple(T) { LargeArrayAlign = 0; MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 0; MaxVectorAlign = 0; + // LLVM can only process alignment up to 2^14 bytes. + MaxPossibleAlign = 8 << 14; MaxTLSAlign = 0; SizeType = UnsignedLong; PtrDiffType = SignedLong; diff --git a/clang/lib/CodeGen/ABIInfoImpl.cpp b/clang/lib/CodeGen/ABIInfoImpl.cpp index e9a26abb77837..2b469d999438e 100644 --- a/clang/lib/CodeGen/ABIInfoImpl.cpp +++ b/clang/lib/CodeGen/ABIInfoImpl.cpp @@ -38,6 +38,10 @@ ABIArgInfo DefaultABIInfo::classifyArgumentType(QualType Ty) const { : Context.LongLongTy)) return getNaturalAlignIndirect(Ty); + if (Ty->getAs<VectorType>() && + Context.getTypeSize(Ty) > getTarget().getMaxPossibleAlign()) + return getNaturalAlignIndirect(Ty); + return (isPromotableIntegerTypeForABI(Ty) ? ABIArgInfo::getExtend(Ty) : ABIArgInfo::getDirect()); } @@ -60,6 +64,10 @@ ABIArgInfo DefaultABIInfo::classifyReturnType(QualType RetTy) const { : getContext().LongLongTy)) return getNaturalAlignIndirect(RetTy); + if (RetTy->getAs<VectorType>() && + getContext().getTypeSize(RetTy) > getTarget().getMaxPossibleAlign()) + return getNaturalAlignIndirect(RetTy); + return (isPromotableIntegerTypeForABI(RetTy) ? ABIArgInfo::getExtend(RetTy) : ABIArgInfo::getDirect()); } diff --git a/clang/lib/CodeGen/Targets/X86.cpp b/clang/lib/CodeGen/Targets/X86.cpp index 1dc3172a6bdf9..de6f7580475fd 100644 --- a/clang/lib/CodeGen/Targets/X86.cpp +++ b/clang/lib/CodeGen/Targets/X86.cpp @@ -2175,6 +2175,10 @@ ABIArgInfo X86_64ABIInfo::getIndirectReturnResult(QualType Ty) const { if (Ty->isBitIntType()) return getNaturalAlignIndirect(Ty); + if (Ty->getAs<VectorType>() && + getContext().getTypeSize(Ty) > getTarget().getMaxPossibleAlign()) + return getNaturalAlignIndirect(Ty); + return (isPromotableIntegerTypeForABI(Ty) ? ABIArgInfo::getExtend(Ty) : ABIArgInfo::getDirect()); } diff --git a/clang/test/CodeGen/big-vectors.c b/clang/test/CodeGen/big-vectors.c new file mode 100644 index 0000000000000..dc44ca07ab8b0 --- /dev/null +++ b/clang/test/CodeGen/big-vectors.c @@ -0,0 +1,17 @@ +// RUN: %clang_cc1 -O0 -triple x86_64 %s -emit-llvm -o - | FileCheck --check-prefixes=x86 %s +// RUN: %clang_cc1 -O0 -triple spir64 %s -emit-llvm -o - | FileCheck --check-prefixes=SPIR %s + +typedef float fvec __attribute__((ext_vector_type(5120))); +fvec foo(fvec a) { + fvec c; + return c; +} +// x86-DAG: define{{.*}}@foo{{.*}}sret(<5120 x float>) align 16384{{.*}}byval(<5120 x float>) align 16384 +// SPIR: define{{.*}}@foo({{.*}}sret(<5120 x float>) align 16384{{.*}}byval(<5120 x float>) align 16384 + +void bar() { + fvec a; + fvec c = foo(a); +// x86-DAG: call void @foo({{.*}}sret(<5120 x float>) align 16384{{.*}}byval(<5120 x float>) align 16384 +// SPIR: call spir_func void @foo({{.*}}sret(<5120 x float>) align 16384{{.*}}byval(<5120 x float>) align 16384 +} `````````` </details> https://github.com/llvm/llvm-project/pull/98629 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
