[llvm] r196843 - Refactor the construction of the DataLayout string on ARM.

[Jim Grosbach]

Mind adding some comments explaining the the differences?

Is there any way to write test cases?

On Dec 9, 2013, at 3:56 PM, Rafael Espindola <rafael.espindola at gmail.com> wrote:

> Author: rafael
> Date: Mon Dec  9 17:56:41 2013
> New Revision: 196843
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=196843&view=rev
> Log:
> Refactor the construction of the DataLayout string on ARM.
> 
> Modified:
>    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> 
> Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=196843&r1=196842&r2=196843&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Mon Dec  9 17:56:41 2013
> @@ -67,6 +67,43 @@ void ARMBaseTargetMachine::addAnalysisPa
> 
> void ARMTargetMachine::anchor() { }
> 
> +static std::string computeDataLayout(ARMSubtarget &ST) {
> +  std::string Ret = "e-p:32:32";
> +
> +  if (ST.isAPCS_ABI())
> +    Ret += "-f64:32:64-i64:32:64";
> +  else
> +    Ret += "-f64:64:64-i64:64:64";
> +
> +  if (ST.isThumb()) {
> +    if (ST.isAPCS_ABI())
> +      Ret += "-i16:16:32-i8:8:32-i1:8:32";
> +    else
> +      Ret += "-i16:16:32-i8:8:32-i1:8:32”;

These are identical?

> +  }
> +
> +  if (ST.isAPCS_ABI())
> +    Ret += "-v128:32:128-v64:32:64";
> +  else
> +    Ret += "-v128:64:128-v64:64:64";
> +
> +  if (ST.isThumb()) {
> +    if (ST.isAPCS_ABI())
> +      Ret += "-a:0:32";
> +    else
> +      Ret += "-a:0:32”;

These are identical?

> +  }
> +
> +  Ret += "-n32";
> +
> +  if (ST.isAAPCS_ABI())
> +    Ret += "-S64";
> +  else
> +    Ret += "-S32";
> +
> +  return Ret;
> +}
> +
> ARMTargetMachine::ARMTargetMachine(const Target &T, StringRef TT,
>                                    StringRef CPU, StringRef FS,
>                                    const TargetOptions &Options,
> @@ -74,14 +111,7 @@ ARMTargetMachine::ARMTargetMachine(const
>                                    CodeGenOpt::Level OL)
>   : ARMBaseTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
>     InstrInfo(Subtarget),
> -    DL(Subtarget.isAPCS_ABI() ?
> -               std::string("e-p:32:32-f64:32:64-i64:32:64-"
> -                           "v128:32:128-v64:32:64-n32-S32") :
> -               Subtarget.isAAPCS_ABI() ?
> -               std::string("e-p:32:32-f64:64:64-i64:64:64-"
> -                           "v128:64:128-v64:64:64-n32-S64") :
> -               std::string("e-p:32:32-f64:64:64-i64:64:64-"
> -                           "v128:64:128-v64:64:64-n32-S32")),
> +    DL(computeDataLayout(Subtarget)),
>     TLInfo(*this),
>     TSInfo(*this),
>     FrameLowering(Subtarget) {
> @@ -102,17 +132,7 @@ ThumbTargetMachine::ThumbTargetMachine(c
>     InstrInfo(Subtarget.hasThumb2()
>               ? ((ARMBaseInstrInfo*)new Thumb2InstrInfo(Subtarget))
>               : ((ARMBaseInstrInfo*)new Thumb1InstrInfo(Subtarget))),
> -    DL(Subtarget.isAPCS_ABI() ?
> -               std::string("e-p:32:32-f64:32:64-i64:32:64-"
> -                           "i16:16:32-i8:8:32-i1:8:32-"
> -                           "v128:32:128-v64:32:64-a:0:32-n32-S32") :
> -               Subtarget.isAAPCS_ABI() ?
> -               std::string("e-p:32:32-f64:64:64-i64:64:64-"
> -                           "i16:16:32-i8:8:32-i1:8:32-"
> -                           "v128:64:128-v64:64:64-a:0:32-n32-S64") :
> -               std::string("e-p:32:32-f64:64:64-i64:64:64-"
> -                           "i16:16:32-i8:8:32-i1:8:32-"
> -                           "v128:64:128-v64:64:64-a:0:32-n32-S32")),
> +    DL(computeDataLayout(Subtarget)),
>     TLInfo(*this),
>     TSInfo(*this),
>     FrameLowering(Subtarget.hasThumb2()
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits