[llvm-commits] [llvm] r72894 - in /llvm/trunk: include/llvm/Attributes.h include/llvm/Target/TargetOptions.h lib/AsmParser/LLLexer.cpp lib/AsmParser/LLParser.cpp lib/AsmParser/LLToken.h lib/Target/PowerPC/PPCRegisterInfo.cpp lib/Target/TargetMachine.cpp lib/Target/X86/X86RegisterInfo.cpp lib/VMCore/Attributes.cpp test/CodeGen/X86/red-zone2.ll tools/llc/llc.cpp
Nick Lewycky
nicholas at mxc.ca
Sun Jun 7 11:05:15 PDT 2009
This attribute needs an entry in LangRef. Please add one.
Also, I'm now getting "noredzone" notes on all my functions all the time
when building x86-32 Linux. I suppose that's technically true but do we
really need this everywhere?
Why disable the redzone anyways? Isn't it an ABI feature?
Nick
Devang Patel wrote:
> Author: dpatel
> Date: Thu Jun 4 17:05:33 2009
> New Revision: 72894
>
> URL: http://llvm.org/viewvc/llvm-project?rev=72894&view=rev
> Log:
> Add new function attribute - noredzone.
> Update code generator to use this attribute and remove DisableRedZone target option.
> Update llc to set this attribute when -disable-red-zone command line option is used.
>
> Added:
> llvm/trunk/test/CodeGen/X86/red-zone2.ll
> Modified:
> llvm/trunk/include/llvm/Attributes.h
> llvm/trunk/include/llvm/Target/TargetOptions.h
> llvm/trunk/lib/AsmParser/LLLexer.cpp
> llvm/trunk/lib/AsmParser/LLParser.cpp
> llvm/trunk/lib/AsmParser/LLToken.h
> llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp
> llvm/trunk/lib/Target/TargetMachine.cpp
> llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
> llvm/trunk/lib/VMCore/Attributes.cpp
> llvm/trunk/tools/llc/llc.cpp
>
> Modified: llvm/trunk/include/llvm/Attributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Attributes.h (original)
> +++ llvm/trunk/include/llvm/Attributes.h Thu Jun 4 17:05:33 2009
> @@ -54,13 +54,15 @@
> // stored as log2 of alignment with +1 bias
> // 0 means unaligned different from align 1
> const Attributes NoCapture = 1<<21; ///< Function creates no aliases of pointer
> +const Attributes NoRedZone = 1<<22; /// disable redzone
>
> /// @brief Attributes that only apply to function parameters.
> const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;
>
> /// @brief Attributes that only apply to function.
> const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly |
> - NoInline | AlwaysInline | OptimizeForSize | StackProtect | StackProtectReq;
> + NoInline | AlwaysInline | OptimizeForSize | StackProtect | StackProtectReq |
> + NoRedZone;
>
> /// @brief Parameter attributes that do not apply to vararg call arguments.
> const Attributes VarArgsIncompatible = StructRet;
>
> Modified: llvm/trunk/include/llvm/Target/TargetOptions.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetOptions.h?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Target/TargetOptions.h (original)
> +++ llvm/trunk/include/llvm/Target/TargetOptions.h Thu Jun 4 17:05:33 2009
> @@ -117,10 +117,6 @@
> /// wth earlier copy coalescing.
> extern bool StrongPHIElim;
>
> - /// DisableRedZone - This flag disables use of the "Red Zone" on
> - /// targets which would otherwise have one.
> - extern bool DisableRedZone;
> -
> } // End llvm namespace
>
> #endif
>
> Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
> +++ llvm/trunk/lib/AsmParser/LLLexer.cpp Thu Jun 4 17:05:33 2009
> @@ -547,6 +547,7 @@
> KEYWORD(optsize);
> KEYWORD(ssp);
> KEYWORD(sspreq);
> + KEYWORD(noredzone);
>
> KEYWORD(type);
> KEYWORD(opaque);
>
> Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
> +++ llvm/trunk/lib/AsmParser/LLParser.cpp Thu Jun 4 17:05:33 2009
> @@ -730,7 +730,7 @@
> case lltok::kw_optsize: Attrs |= Attribute::OptimizeForSize; break;
> case lltok::kw_ssp: Attrs |= Attribute::StackProtect; break;
> case lltok::kw_sspreq: Attrs |= Attribute::StackProtectReq; break;
> -
> + case lltok::kw_noredzone: Attrs |= Attribute::NoRedZone; break;
>
> case lltok::kw_align: {
> unsigned Alignment;
>
> Modified: llvm/trunk/lib/AsmParser/LLToken.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLToken.h?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLToken.h (original)
> +++ llvm/trunk/lib/AsmParser/LLToken.h Thu Jun 4 17:05:33 2009
> @@ -80,6 +80,7 @@
> kw_optsize,
> kw_ssp,
> kw_sspreq,
> + kw_noredzone,
>
> kw_type,
> kw_opaque,
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp Thu Jun 4 17:05:33 2009
> @@ -908,6 +908,7 @@
> // If we are a leaf function, and use up to 224 bytes of stack space,
> // don't have a frame pointer, calls, or dynamic alloca then we do not need
> // to adjust the stack pointer (we fit in the Red Zone).
> + bool DisableRedZone = MF.getFunction()->hasFnAttr(Attribute::NoRedZone);
> if (!DisableRedZone &&
> FrameSize <= 224 && // Fits in red zone.
> !MFI->hasVarSizedObjects() && // No dynamic alloca.
>
> Modified: llvm/trunk/lib/Target/TargetMachine.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/TargetMachine.cpp (original)
> +++ llvm/trunk/lib/Target/TargetMachine.cpp Thu Jun 4 17:05:33 2009
> @@ -41,7 +41,6 @@
> bool RealignStack;
> bool DisableJumpTables;
> bool StrongPHIElim;
> - bool DisableRedZone;
> bool AsmVerbosityDefault(false);
> }
>
> @@ -163,11 +162,6 @@
> cl::desc("Use strong PHI elimination."),
> cl::location(StrongPHIElim),
> cl::init(false));
> -static cl::opt<bool, true>
> -DisableRedZoneOption("disable-red-zone",
> - cl::desc("Do not emit code that uses the red zone."),
> - cl::location(DisableRedZone),
> - cl::init(false));
>
> //---------------------------------------------------------------------------
> // TargetMachine Class
>
> Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Thu Jun 4 17:05:33 2009
> @@ -751,6 +751,7 @@
> // function, and use up to 128 bytes of stack space, don't have a frame
> // pointer, calls, or dynamic alloca then we do not need to adjust the
> // stack pointer (we fit in the Red Zone).
> + bool DisableRedZone = Fn->hasFnAttr(Attribute::NoRedZone);
> if (Is64Bit && !DisableRedZone &&
> !needsStackRealignment(MF) &&
> !MFI->hasVarSizedObjects() && // No dynamic alloca.
>
> Modified: llvm/trunk/lib/VMCore/Attributes.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/Attributes.cpp (original)
> +++ llvm/trunk/lib/VMCore/Attributes.cpp Thu Jun 4 17:05:33 2009
> @@ -59,6 +59,8 @@
> Result += "ssp ";
> if (Attrs & Attribute::StackProtectReq)
> Result += "sspreq ";
> + if (Attrs & Attribute::NoRedZone)
> + Result += "noredzone ";
> if (Attrs & Attribute::Alignment) {
> Result += "align ";
> Result += utostr(Attribute::getAlignmentFromAttrs(Attrs));
>
> Added: llvm/trunk/test/CodeGen/X86/red-zone2.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/red-zone2.ll?rev=72894&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/red-zone2.ll (added)
> +++ llvm/trunk/test/CodeGen/X86/red-zone2.ll Thu Jun 4 17:05:33 2009
> @@ -0,0 +1,9 @@
> +; RUN: llvm-as < %s | llc -march=x86-64 > %t
> +; RUN: grep subq %t | count 1
> +; RUN: grep addq %t | count 1
> +
> +define x86_fp80 @f0(float %f) nounwind readnone noredzone {
> +entry:
> + %0 = fpext float %f to x86_fp80 ; <x86_fp80> [#uses=1]
> + ret x86_fp80 %0
> +}
>
> Modified: llvm/trunk/tools/llc/llc.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=72894&r1=72893&r2=72894&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/llc/llc.cpp (original)
> +++ llvm/trunk/tools/llc/llc.cpp Thu Jun 4 17:05:33 2009
> @@ -100,6 +100,11 @@
> cl::desc("Do not verify input module"));
>
>
> +static cl::opt<bool>
> +DisableRedZone("disable-red-zone",
> + cl::desc("Do not emit code that uses the red zone."),
> + cl::init(false));
> +
> // GetFileNameRoot - Helper function to get the basename of a filename.
> static inline std::string
> GetFileNameRoot(const std::string &InputFilename) {
> @@ -336,8 +341,11 @@
> // Run our queue of passes all at once now, efficiently.
> // TODO: this could lazily stream functions out of the module.
> for (Module::iterator I = mod.begin(), E = mod.end(); I != E; ++I)
> - if (!I->isDeclaration())
> + if (!I->isDeclaration()) {
> + if (DisableRedZone)
> + I->addFnAttr(Attribute::NoRedZone);
> Passes.run(*I);
> + }
>
> Passes.doFinalization();
> }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list