[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp PPC32JITInfo.h PPC32TargetMachine.h PPC64JITInfo.h PPC64TargetMachine.h PowerPC.h PowerPCTargetMachine.cpp PowerPCTargetMachine.h PPC32.h PPC32TargetMachine.cpp PPC64.h PPC64TargetMachine.cpp
Nate Begeman
natebegeman at mac.com
Wed Aug 11 00:40:15 PDT 2004
Changes in directory llvm/lib/Target/PowerPC:
PPC32ISelSimple.cpp updated: 1.59 -> 1.60
PPC32JITInfo.h updated: 1.1 -> 1.2
PPC32TargetMachine.h updated: 1.1 -> 1.2
PPC64JITInfo.h updated: 1.1 -> 1.2
PPC64TargetMachine.h updated: 1.1 -> 1.2
PowerPC.h updated: 1.5 -> 1.6
PowerPCTargetMachine.cpp updated: 1.24 -> 1.25
PowerPCTargetMachine.h updated: 1.4 -> 1.5
PPC32.h (r1.1) removed
PPC32TargetMachine.cpp (r1.1) removed
PPC64.h (r1.1) removed
PPC64TargetMachine.cpp (r1.1) removed
---
Log message:
Clean up 32/64bit and Darwin/AIX split. Next steps: 64 bit ISel, AIX asm printer.
---
Diffs of the changes: (+140 -24)
Index: llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
diff -u llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.59 llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.60
--- llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.59 Wed Aug 11 02:34:50 2004
+++ llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp Wed Aug 11 02:40:04 2004
@@ -11,7 +11,6 @@
#include "PowerPC.h"
#include "PowerPCInstrBuilder.h"
#include "PowerPCInstrInfo.h"
-#include "PPC32.h"
#include "PPC32TargetMachine.h"
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
Index: llvm/lib/Target/PowerPC/PPC32JITInfo.h
diff -u llvm/lib/Target/PowerPC/PPC32JITInfo.h:1.1 llvm/lib/Target/PowerPC/PPC32JITInfo.h:1.2
--- llvm/lib/Target/PowerPC/PPC32JITInfo.h:1.1 Tue Aug 10 19:09:42 2004
+++ llvm/lib/Target/PowerPC/PPC32JITInfo.h Wed Aug 11 02:40:04 2004
@@ -24,12 +24,6 @@
public:
PPC32JITInfo(TargetMachine &tm) : PowerPCJITInfo(tm) {}
- /// addPassesToJITCompile - Add passes to the specified pass manager to
- /// implement a fast dynamic compiler for this target. Return true if this
- /// is not supported for this target.
- ///
- virtual void addPassesToJITCompile(FunctionPassManager &PM);
-
/// replaceMachineCodeForFunction - Make it so that calling the function
/// whose machine code is at OLD turns into a call to NEW, perhaps by
/// overwriting OLD with a branch to NEW. This is used for self-modifying
Index: llvm/lib/Target/PowerPC/PPC32TargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.1 llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.2
--- llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.1 Tue Aug 10 19:09:42 2004
+++ llvm/lib/Target/PowerPC/PPC32TargetMachine.h Wed Aug 11 02:40:04 2004
@@ -38,14 +38,7 @@
virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
MachineCodeEmitter &MCE);
- virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
-
static unsigned getModuleMatchQuality(const Module &M);
-
- // Two shared sets between the instruction selector and the printer allow for
- // correct linkage on Darwin
- std::set<GlobalValue*> CalledFunctions;
- std::set<GlobalValue*> AddressTaken;
};
} // end namespace llvm
Index: llvm/lib/Target/PowerPC/PPC64JITInfo.h
diff -u llvm/lib/Target/PowerPC/PPC64JITInfo.h:1.1 llvm/lib/Target/PowerPC/PPC64JITInfo.h:1.2
--- llvm/lib/Target/PowerPC/PPC64JITInfo.h:1.1 Tue Aug 10 19:10:41 2004
+++ llvm/lib/Target/PowerPC/PPC64JITInfo.h Wed Aug 11 02:40:04 2004
@@ -23,12 +23,6 @@
public:
PPC64JITInfo(TargetMachine &tm) : PowerPCJITInfo(tm) {}
- /// addPassesToJITCompile - Add passes to the specified pass manager to
- /// implement a fast dynamic compiler for this target. Return true if this
- /// is not supported for this target.
- ///
- virtual void addPassesToJITCompile(FunctionPassManager &PM);
-
/// replaceMachineCodeForFunction - Make it so that calling the function
/// whose machine code is at OLD turns into a call to NEW, perhaps by
/// overwriting OLD with a branch to NEW. This is used for self-modifying
Index: llvm/lib/Target/PowerPC/PPC64TargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPC64TargetMachine.h:1.1 llvm/lib/Target/PowerPC/PPC64TargetMachine.h:1.2
--- llvm/lib/Target/PowerPC/PPC64TargetMachine.h:1.1 Tue Aug 10 19:10:41 2004
+++ llvm/lib/Target/PowerPC/PPC64TargetMachine.h Wed Aug 11 02:40:04 2004
@@ -31,8 +31,6 @@
virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
MachineCodeEmitter &MCE);
- virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
-
static unsigned getModuleMatchQuality(const Module &M);
};
Index: llvm/lib/Target/PowerPC/PowerPC.h
diff -u llvm/lib/Target/PowerPC/PowerPC.h:1.5 llvm/lib/Target/PowerPC/PowerPC.h:1.6
--- llvm/lib/Target/PowerPC/PowerPC.h:1.5 Tue Aug 10 19:11:25 2004
+++ llvm/lib/Target/PowerPC/PowerPC.h Wed Aug 11 02:40:04 2004
@@ -15,12 +15,18 @@
#ifndef TARGET_POWERPC_H
#define TARGET_POWERPC_H
+#include <iosfwd>
+
namespace llvm {
class FunctionPass;
+class TargetMachine;
FunctionPass *createPowerPCPEI();
FunctionPass *createPPCBranchSelectionPass();
+FunctionPass *createPPC32ISelSimple(TargetMachine &TM);
+FunctionPass *createPPC64ISelSimple(TargetMachine &TM);
+FunctionPass *createPPC32AsmPrinter(std::ostream &OS,TargetMachine &TM);
} // end namespace llvm;
Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.24 llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.25
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.24 Tue Aug 10 19:11:25 2004
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp Wed Aug 11 02:40:04 2004
@@ -10,8 +10,12 @@
//
//===----------------------------------------------------------------------===//
-#include "PowerPCTargetMachine.h"
#include "PowerPC.h"
+#include "PowerPCTargetMachine.h"
+#include "PPC32TargetMachine.h"
+#include "PPC64TargetMachine.h"
+#include "PPC32JITInfo.h"
+#include "PPC64JITInfo.h"
#include "llvm/Module.h"
#include "llvm/PassManager.h"
#include "llvm/CodeGen/IntrinsicLowering.h"
@@ -20,9 +24,25 @@
#include "llvm/Target/TargetOptions.h"
#include "llvm/Target/TargetMachineRegistry.h"
#include "llvm/Transforms/Scalar.h"
+#include "Support/CommandLine.h"
#include <iostream>
using namespace llvm;
+namespace {
+ cl::opt<bool>
+ AIX("aix",
+ cl::desc("Generate AIX/xcoff rather than Darwin/macho"),
+ cl::Hidden);
+ const std::string PPC32 = "PowerPC/32bit";
+ const std::string PPC64 = "PowerPC/64bit";
+
+ // Register the targets
+ RegisterTarget<PPC32TargetMachine>
+ X("ppc32", " PowerPC 32bit (experimental)");
+ RegisterTarget<PPC64TargetMachine>
+ Y("ppc64", " PowerPC 64bit (unimplemented)");
+}
+
PowerPCTargetMachine::PowerPCTargetMachine(const std::string &name,
IntrinsicLowering *IL,
const TargetData &TD,
@@ -38,8 +58,74 @@
#endif
}
+/// addPassesToEmitAssembly - Add passes to the specified pass manager
+/// to implement a static compiler for this target.
+///
+bool PowerPCTargetMachine::addPassesToEmitAssembly(PassManager &PM,
+ std::ostream &Out) {
+ bool LP64 = (0 != dynamic_cast<PPC64TargetMachine *>(this));
+
+ // FIXME: Implement efficient support for garbage collection intrinsics.
+ PM.add(createLowerGCPass());
+
+ // FIXME: Implement the invoke/unwind instructions!
+ PM.add(createLowerInvokePass());
+
+ // FIXME: Implement the switch instruction in the instruction selector!
+ PM.add(createLowerSwitchPass());
+
+ PM.add(createLowerConstantExpressionsPass());
+
+ // Make sure that no unreachable blocks are instruction selected.
+ PM.add(createUnreachableBlockEliminationPass());
+
+ if (LP64)
+ PM.add(createPPC32ISelSimple(*this));
+ else
+ PM.add(createPPC32ISelSimple(*this));
+
+ if (PrintMachineCode)
+ PM.add(createMachineFunctionPrinterPass(&std::cerr));
+
+ PM.add(createRegisterAllocator());
+
+ if (PrintMachineCode)
+ PM.add(createMachineFunctionPrinterPass(&std::cerr));
+
+ // I want a PowerPC specific prolog/epilog code inserter so I can put the
+ // fills/spills in the right spots.
+ PM.add(createPowerPCPEI());
+
+ // Must run branch selection immediately preceding the printer
+ PM.add(createPPCBranchSelectionPass());
+
+ if (AIX)
+ PM.add(createPPC32AsmPrinter(Out, *this));
+ else
+ PM.add(createPPC32AsmPrinter(Out, *this));
+
+ PM.add(createMachineCodeDeleter());
+ return false;
+}
+
void PowerPCJITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
- assert(0 && "Cannot execute PowerPCJITInfo::addPassesToJITCompile()");
+ // FIXME: Implement efficient support for garbage collection intrinsics.
+ PM.add(createLowerGCPass());
+
+ // FIXME: Implement the invoke/unwind instructions!
+ PM.add(createLowerInvokePass());
+
+ // FIXME: Implement the switch instruction in the instruction selector!
+ PM.add(createLowerSwitchPass());
+
+ PM.add(createLowerConstantExpressionsPass());
+
+ // Make sure that no unreachable blocks are instruction selected.
+ PM.add(createUnreachableBlockEliminationPass());
+
+ PM.add(createPPC32ISelSimple(TM));
+ PM.add(createRegisterAllocator());
+ PM.add(createPrologEpilogCodeInserter());
}
void PowerPCJITInfo::replaceMachineCodeForFunction(void *Old, void *New) {
@@ -51,3 +137,42 @@
assert(0 && "Cannot execute PowerPCJITInfo::getJITStubForFunction()");
return 0;
}
+
+/// PowerPCTargetMachine ctor - Create an ILP32 architecture model
+///
+PPC32TargetMachine::PPC32TargetMachine(const Module &M,
+ IntrinsicLowering *IL)
+ : PowerPCTargetMachine(PPC32, IL,
+ TargetData(PPC32,false,4,4,4,4,4,4,2,1,4),
+ TargetFrameInfo(TargetFrameInfo::StackGrowsDown,16,0),
+ PPC32JITInfo(*this)) {}
+
+/// PPC64TargetMachine ctor - Create a LP64 architecture model
+///
+PPC64TargetMachine::PPC64TargetMachine(const Module &M, IntrinsicLowering *IL)
+ : PowerPCTargetMachine(PPC64, IL,
+ TargetData(PPC64,false,8,4,4,4,4,4,2,1,4),
+ TargetFrameInfo(TargetFrameInfo::StackGrowsDown,16,0),
+ PPC64JITInfo(*this)) {}
+
+unsigned PPC32TargetMachine::getModuleMatchQuality(const Module &M) {
+ if (M.getEndianness() == Module::BigEndian &&
+ M.getPointerSize() == Module::Pointer32)
+ return 10; // Direct match
+ else if (M.getEndianness() != Module::AnyEndianness ||
+ M.getPointerSize() != Module::AnyPointerSize)
+ return 0; // Match for some other target
+
+ return getJITMatchQuality()/2;
+}
+
+unsigned PPC64TargetMachine::getModuleMatchQuality(const Module &M) {
+ if (M.getEndianness() == Module::BigEndian &&
+ M.getPointerSize() == Module::Pointer64)
+ return 10; // Direct match
+ else if (M.getEndianness() != Module::AnyEndianness ||
+ M.getPointerSize() != Module::AnyPointerSize)
+ return 0; // Match for some other target
+
+ return getJITMatchQuality()/2;
+}
Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.h
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.4 llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.5
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.4 Tue Aug 10 19:11:25 2004
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.h Wed Aug 11 02:40:04 2004
@@ -46,6 +46,13 @@
}
static unsigned getJITMatchQuality();
+
+ virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
+
+ // Two shared sets between the instruction selector and the printer allow for
+ // correct linkage on Darwin
+ std::set<GlobalValue*> CalledFunctions;
+ std::set<GlobalValue*> AddressTaken;
};
} // end namespace llvm
More information about the llvm-commits
mailing list