[llvm] r210996 - Temporarily revert r210953 in an attempt to bring the ARM buildbots
Eric Christopher
echristo at gmail.com
Fri Aug 29 10:41:52 PDT 2014
Should be done shortly after I get back from holiday. :)
On Aug 29, 2014 5:40 PM, "Jim Grosbach" <grosbach at apple.com> wrote:
> <troll>Penance for not re-killing the old JIT yet. ;) </troll>
>
> > On Jun 15, 2014, at 12:55 PM, Eric Christopher <echristo at gmail.com>
> wrote:
> >
> > Author: echristo
> > Date: Sun Jun 15 14:55:14 2014
> > New Revision: 210996
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=210996&view=rev
> > Log:
> > Temporarily revert r210953 in an attempt to bring the ARM buildbots
> > back.
> >
> > Modified:
> > llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp
> > llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp
> > llvm/trunk/lib/Target/ARM/ARMJITInfo.h
> > llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp
> > llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h
> > llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp
> > llvm/trunk/lib/Target/ARM/ARMSubtarget.h
> > llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> > llvm/trunk/lib/Target/ARM/ARMTargetMachine.h
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp Sun Jun 15 14:55:14 2014
> > @@ -15,7 +15,6 @@
> > #include "ARM.h"
> > #include "ARMBaseInstrInfo.h"
> > #include "ARMConstantPoolValue.h"
> > -#include "ARMMachineFunctionInfo.h"
> > #include "ARMRelocations.h"
> > #include "ARMSubtarget.h"
> > #include "ARMTargetMachine.h"
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Sun Jun 15 14:55:14 2014
> > @@ -13,7 +13,6 @@
> >
> > #include "ARMJITInfo.h"
> > #include "ARMConstantPoolValue.h"
> > -#include "ARMMachineFunctionInfo.h"
> > #include "ARMRelocations.h"
> > #include "MCTargetDesc/ARMBaseInfo.h"
> > #include "llvm/CodeGen/JITCodeEmitter.h"
> > @@ -335,10 +334,3 @@ void ARMJITInfo::relocate(void *Function
> > }
> > }
> > }
> > -
> > -void ARMJITInfo::Initialize(const MachineFunction &MF, bool isPIC) {
> > - const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
> > - ConstPoolId2AddrMap.resize(AFI->getNumPICLabels());
> > - JumpTableId2AddrMap.resize(AFI->getNumJumpTables());
> > - IsPIC = isPIC;
> > -}
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.h
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.h?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMJITInfo.h (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.h Sun Jun 15 14:55:14 2014
> > @@ -14,6 +14,7 @@
> > #ifndef ARMJITINFO_H
> > #define ARMJITINFO_H
> >
> > +#include "ARMMachineFunctionInfo.h"
> > #include "llvm/ADT/DenseMap.h"
> > #include "llvm/ADT/SmallVector.h"
> > #include "llvm/CodeGen/MachineConstantPool.h"
> > @@ -102,7 +103,12 @@ namespace llvm {
> > /// Resize constant pool ids to CONSTPOOL_ENTRY addresses map; resize
> > /// jump table ids to jump table bases map; remember if codegen
> relocation
> > /// model is PIC.
> > - void Initialize(const MachineFunction &MF, bool isPIC);
> > + void Initialize(const MachineFunction &MF, bool isPIC) {
> > + const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
> > + ConstPoolId2AddrMap.resize(AFI->getNumPICLabels());
> > + JumpTableId2AddrMap.resize(AFI->getNumJumpTables());
> > + IsPIC = isPIC;
> > + }
> >
> > /// getConstantPoolEntryAddr - The ARM target puts all constant
> > /// pool entries into constant islands. This returns the address of
> the
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp Sun Jun 15
> 14:55:14 2014
> > @@ -12,13 +12,3 @@
> > using namespace llvm;
> >
> > void ARMFunctionInfo::anchor() { }
> > -
> > -ARMFunctionInfo::ARMFunctionInfo(MachineFunction &MF)
> > - : isThumb(MF.getTarget().getSubtarget<ARMSubtarget>().isThumb()),
> > -
> hasThumb2(MF.getTarget().getSubtarget<ARMSubtarget>().hasThumb2()),
> > - StByValParamsPadding(0), ArgRegsSaveSize(0), HasStackFrame(false),
> > - RestoreSPFromFP(false), LRSpilledForFarJump(false),
> > - FramePtrSpillOffset(0), GPRCS1Offset(0), GPRCS2Offset(0),
> DPRCSOffset(0),
> > - GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0), JumpTableUId(0),
> > - PICLabelUId(0), VarArgsFrameIndex(0), HasITBlocks(false),
> > - GlobalBaseReg(0) {}
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h Sun Jun 15
> 14:55:14 2014
> > @@ -130,7 +130,16 @@ public:
> > JumpTableUId(0), PICLabelUId(0),
> > VarArgsFrameIndex(0), HasITBlocks(false), GlobalBaseReg(0) {}
> >
> > - explicit ARMFunctionInfo(MachineFunction &MF);
> > + explicit ARMFunctionInfo(MachineFunction &MF) :
> > + isThumb(MF.getTarget().getSubtarget<ARMSubtarget>().isThumb()),
> > + hasThumb2(MF.getTarget().getSubtarget<ARMSubtarget>().hasThumb2()),
> > + StByValParamsPadding(0),
> > + ArgRegsSaveSize(0), HasStackFrame(false), RestoreSPFromFP(false),
> > + LRSpilledForFarJump(false),
> > + FramePtrSpillOffset(0), GPRCS1Offset(0), GPRCS2Offset(0),
> DPRCSOffset(0),
> > + GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0),
> > + JumpTableUId(0), PICLabelUId(0),
> > + VarArgsFrameIndex(0), HasITBlocks(false), GlobalBaseReg(0) {}
> >
> > bool isThumbFunction() const { return isThumb; }
> > bool isThumb1OnlyFunction() const { return isThumb && !hasThumb2; }
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp Sun Jun 15 14:55:14 2014
> > @@ -148,7 +148,7 @@ ARMSubtarget::ARMSubtarget(const std::st
> > ARMProcClass(None), stackAlignment(4), CPUString(CPU),
> IsLittle(IsLittle),
> > TargetTriple(TT), Options(Options), TargetABI(ARM_ABI_UNKNOWN),
> > DL(computeDataLayout(initializeSubtargetDependencies(CPU, FS))),
> > - TSInfo(DL), JITInfo() {}
> > + TSInfo(DL) {}
> >
> > void ARMSubtarget::initializeEnvironment() {
> > HasV4TOps = false;
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMSubtarget.h
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.h?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMSubtarget.h (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMSubtarget.h Sun Jun 15 14:55:14 2014
> > @@ -14,7 +14,6 @@
> > #ifndef ARMSUBTARGET_H
> > #define ARMSUBTARGET_H
> >
> > -#include "ARMJITInfo.h"
> > #include "ARMSelectionDAGInfo.h"
> > #include "MCTargetDesc/ARMMCTargetDesc.h"
> > #include "llvm/ADT/Triple.h"
> > @@ -257,12 +256,10 @@ protected:
> >
> > const DataLayout *getDataLayout() const { return &DL; }
> > const ARMSelectionDAGInfo *getSelectionDAGInfo() const { return
> &TSInfo; }
> > - ARMJITInfo *getJITInfo() { return &JITInfo; }
> >
> > private:
> > const DataLayout DL;
> > ARMSelectionDAGInfo TSInfo;
> > - ARMJITInfo JITInfo;
> >
> > void initializeEnvironment();
> > void resetSubtargetFeatures(StringRef CPU, StringRef FS);
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Sun Jun 15 14:55:14
> 2014
> > @@ -52,7 +52,7 @@ ARMBaseTargetMachine::ARMBaseTargetMachi
> > CodeGenOpt::Level OL,
> > bool isLittle)
> > : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
> > - Subtarget(TT, CPU, FS, isLittle, Options) {
> > + Subtarget(TT, CPU, FS, isLittle, Options), JITInfo() {
> >
> > // Default to triple-appropriate float ABI
> > if (Options.FloatABIType == FloatABI::Default)
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.h
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.h?rev=210996&r1=210995&r2=210996&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.h (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.h Sun Jun 15 14:55:14 2014
> > @@ -32,6 +32,10 @@ namespace llvm {
> > class ARMBaseTargetMachine : public LLVMTargetMachine {
> > protected:
> > ARMSubtarget Subtarget;
> > +
> > +private:
> > + ARMJITInfo JITInfo;
> > +
> > public:
> > ARMBaseTargetMachine(const Target &T, StringRef TT,
> > StringRef CPU, StringRef FS,
> > @@ -40,6 +44,7 @@ public:
> > CodeGenOpt::Level OL,
> > bool isLittle);
> >
> > + ARMJITInfo *getJITInfo() override { return &JITInfo; }
> > const ARMSubtarget *getSubtargetImpl() const override { return
> &Subtarget; }
> > const ARMTargetLowering *getTargetLowering() const override {
> > // Implemented by derived classes
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140829/cfe70bce/attachment.html>
More information about the llvm-commits
mailing list