[llvm-commits] [llvm] r74624 - in /llvm/trunk: include/llvm/CodeGen/ include/llvm/Target/ lib/Target/ARM/ lib/Target/Alpha/ lib/Target/CellSPU/ lib/Target/IA64/ lib/Target/MSP430/ lib/Target/Mips/ lib/Target/PIC16/ lib/Target/PowerPC/ lib/Target/

Daniel Dunbar daniel at zuster.org
Wed Jul 1 18:40:53 PDT 2009


I probably missed the backstory here, but wouldn't it be better for us
to consistently use byte alignment?

Some contexts will always need non-power of two alignment, and I think
there is value in standardizing on one form. The situation now is we
have code like TargetData::get...Alignment which returns bytes, and
MachineFunction::get...Alignment which returns log2. Alternately we
could include Log2 in the name...

 - Daniel

On Wed, Jul 1, 2009 at 11:51 AM, Bill Wendling<isanbard at gmail.com> wrote:
> Author: void
> Date: Wed Jul  1 13:50:55 2009
> New Revision: 74624
>
> URL: http://llvm.org/viewvc/llvm-project?rev=74624&view=rev
> Log:
> Update comments to make it clear that the function alignment is the Log2 of the
> bytes and not bytes.
>
> Modified:
>    llvm/trunk/include/llvm/CodeGen/MachineFunction.h
>    llvm/trunk/include/llvm/Target/TargetLowering.h
>    llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
>    llvm/trunk/lib/Target/ARM/ARMISelLowering.h
>    llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp
>    llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h
>    llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp
>    llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h
>    llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp
>    llvm/trunk/lib/Target/IA64/IA64ISelLowering.h
>    llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.cpp
>    llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.h
>    llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
>    llvm/trunk/lib/Target/Mips/MipsISelLowering.h
>    llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h
>    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
>    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
>    llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp
>    llvm/trunk/lib/Target/Sparc/SparcISelLowering.h
>    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
>    llvm/trunk/lib/Target/X86/X86ISelLowering.h
>    llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp
>    llvm/trunk/lib/Target/XCore/XCoreISelLowering.h
>
> Modified: llvm/trunk/include/llvm/CodeGen/MachineFunction.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineFunction.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/MachineFunction.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineFunction.h Wed Jul  1 13:50:55 2009
> @@ -151,11 +151,11 @@
>   MachineConstantPool *getConstantPool() { return ConstantPool; }
>   const MachineConstantPool *getConstantPool() const { return ConstantPool; }
>
> -  /// getAlignment - Return the alignment of the function.
> +  /// getAlignment - Return the alignment (log2, not bytes) of the function.
>   ///
>   unsigned getAlignment() const { return Alignment; }
>
> -  /// setAlignment - Set the alignment of the function.
> +  /// setAlignment - Set the alignment (log2, not bytes) of the function.
>   ///
>   void setAlignment(unsigned A) { Alignment = A; }
>
>
> Modified: llvm/trunk/include/llvm/Target/TargetLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Target/TargetLowering.h (original)
> +++ llvm/trunk/include/llvm/Target/TargetLowering.h Wed Jul  1 13:50:55 2009
> @@ -736,7 +736,7 @@
>   /// PIC relocation models.
>   virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
>
> -  /// getFunctionAlignment - Return the alignment of this function.
> +  /// getFunctionAlignment - Return the Log2 alignment of this function.
>   virtual unsigned getFunctionAlignment(const Function *) const = 0;
>
>   //===--------------------------------------------------------------------===//
>
> Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -455,7 +455,7 @@
>   }
>  }
>
> -/// getFunctionAlignment - Return the alignment of this function.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned ARMTargetLowering::getFunctionAlignment(const Function *F) const {
>   return getTargetMachine().getSubtarget<ARMSubtarget>().isThumb() ? 1 : 2;
>  }
>
> Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMISelLowering.h (original)
> +++ llvm/trunk/lib/Target/ARM/ARMISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -197,7 +197,7 @@
>       return Subtarget;
>     }
>
> -    /// getFunctionAlignment - Return the alignment of this function.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>
>   private:
>
> Modified: llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -181,7 +181,7 @@
>   }
>  }
>
> -/// getFunctionAlignment - Return the function alignment.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned AlphaTargetLowering::getFunctionAlignment(const Function *F) const {
>   return 4;
>  }
>
> Modified: llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h (original)
> +++ llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -103,7 +103,7 @@
>
>     virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>
>   private:
>
> Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -481,7 +481,7 @@
>   return ((i != node_names.end()) ? i->second : 0);
>  }
>
> -/// getFunctionAlignment - Return the function alignment.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned SPUTargetLowering::getFunctionAlignment(const Function *) const {
>   return 3;
>  }
>
> Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h (original)
> +++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -149,7 +149,7 @@
>
>     virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>   };
>  }
>
> Modified: llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -148,7 +148,7 @@
>   return MVT::i1;
>  }
>
> -/// getFunctionAlignment - Return the function alignment.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned IA64TargetLowering::getFunctionAlignment(const Function *) const {
>   return 5;
>  }
>
> Modified: llvm/trunk/lib/Target/IA64/IA64ISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64ISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/IA64/IA64ISelLowering.h (original)
> +++ llvm/trunk/lib/Target/IA64/IA64ISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -70,7 +70,7 @@
>     /// (currently, only "ret void")
>     virtual SDValue LowerOperation(SDValue Op, SelectionDAG &DAG);
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>   };
>  }
>
> Modified: llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -127,7 +127,7 @@
>   }
>  }
>
> -/// getFunctionAlignment - Return the alignment of this function.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned MSP430TargetLowering::getFunctionAlignment(const Function *F) const {
>   return F->hasFnAttr(Attribute::OptimizeForSize) ? 1 : 4;
>  }
>
> Modified: llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.h (original)
> +++ llvm/trunk/lib/Target/MSP430/MSP430ISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -74,7 +74,7 @@
>     /// DAG node.
>     virtual const char *getTargetNodeName(unsigned Opcode) const;
>
> -    /// getFunctionAlignment - Return the alignment of this function.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>
>     SDValue LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG);
>
> Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -158,7 +158,7 @@
>   return MVT::i32;
>  }
>
> -/// getFunctionAlignment - Return the function alignment.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned MipsTargetLowering::getFunctionAlignment(const Function *) const {
>   return 2;
>  }
>
> Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Mips/MipsISelLowering.h (original)
> +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -84,7 +84,7 @@
>     /// getSetCCResultType - get the ISD::SETCC result ValueType
>     MVT getSetCCResultType(MVT VT) const;
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>   private:
>     // Subtarget Info
>
> Modified: llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h (original)
> +++ llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -145,7 +145,7 @@
>     unsigned GetTmpSize() { return TmpSize; }
>     void SetTmpSize(unsigned Size) { TmpSize = Size; }
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *) const {
>       // FIXME: The function never seems to be aligned.
>       return 1;
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -432,7 +432,7 @@
>   return MVT::i32;
>  }
>
> -/// getFunctionAlignment - Return the function alignment.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned PPCTargetLowering::getFunctionAlignment(const Function *F) const {
>   if (getTargetMachine().getSubtarget<PPCSubtarget>().isDarwin())
>     return F->hasFnAttr(Attribute::OptimizeForSize) ? 2 : 4;
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -337,7 +337,7 @@
>
>     virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>
>   private:
>
> Modified: llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -1048,7 +1048,7 @@
>   return false;
>  }
>
> -/// getFunctionAlignment - Return the function alignment.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned SparcTargetLowering::getFunctionAlignment(const Function *) const {
>   return 4;
>  }
>
> Modified: llvm/trunk/lib/Target/Sparc/SparcISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Sparc/SparcISelLowering.h (original)
> +++ llvm/trunk/lib/Target/Sparc/SparcISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -74,7 +74,7 @@
>
>     virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
>
> -    /// getFunctionAlignment - Return the function alignment.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>   };
>  } // end namespace llvm
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -1027,7 +1027,7 @@
>   return Table;
>  }
>
> -/// getFunctionAlignment - Return the alignment of this function.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned X86TargetLowering::getFunctionAlignment(const Function *F) const {
>   return F->hasFnAttr(Attribute::OptimizeForSize) ? 1 : 4;
>  }
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -534,7 +534,7 @@
>  #endif
>                    );
>
> -    /// getFunctionAlignment - Return the alignment of this function.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>
>   private:
>
> Modified: llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp Wed Jul  1 13:50:55 2009
> @@ -187,7 +187,7 @@
>   }
>  }
>
> -/// getFunctionAlignment - Return the alignment of this function.
> +/// getFunctionAlignment - Return the Log2 alignment of this function.
>  unsigned XCoreTargetLowering::
>  getFunctionAlignment(const Function *) const {
>   return 1;
>
> Modified: llvm/trunk/lib/Target/XCore/XCoreISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreISelLowering.h?rev=74624&r1=74623&r2=74624&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/XCore/XCoreISelLowering.h (original)
> +++ llvm/trunk/lib/Target/XCore/XCoreISelLowering.h Wed Jul  1 13:50:55 2009
> @@ -84,7 +84,7 @@
>     virtual bool isLegalAddressingMode(const AddrMode &AM,
>                                        const Type *Ty) const;
>
> -    /// getFunctionAlignment - Return the alignment of this function.
> +    /// getFunctionAlignment - Return the Log2 alignment of this function.
>     virtual unsigned getFunctionAlignment(const Function *F) const;
>
>   private:
>
>
> _______________________________________________
> 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