Skip to content

S
swiftshader
Commit 4019f084 by Karl Schimpf
Options

Remove TypeConverter and Module from minimal subzero build.

Removes the need to model LLVM types from the minimal subzero build. It isn't removed from the nonminimal build because IceConverter still needs to be able to convert LLVM types to corresponding Ice types. Note that this CL reduces the size of Release+Min/llvm2ice (after strip) to about 638K bytes. BUG=None R=jvoung@chromium.org, stichnot@chromium.org Review URL: https://codereview.chromium.org/805943002
parent bf170370
Showing with 37 additions and 79 deletions
Makefile.standalone
...@@ -108,13 +108,13 @@ SRCS = \ ...@@ -108,13 +108,13 @@ SRCS = \
IceTargetLoweringX8632.cpp \ IceTargetLoweringX8632.cpp \
IceTimerTree.cpp \ IceTimerTree.cpp \
IceTranslator.cpp \ IceTranslator.cpp \
IceTypeConverter.cpp \
IceTypes.cpp \ IceTypes.cpp \
llvm2ice.cpp \ llvm2ice.cpp \
PNaClTranslator.cpp PNaClTranslator.cpp
ifndef MINIMAL ifndef MINIMAL
SRCS += IceConverter.cpp SRCS += IceConverter.cpp \
IceTypeConverter.cpp
endif endif
OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS)) OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
......
src/IceConverter.cpp
...@@ -349,8 +349,7 @@ private: ...@@ -349,8 +349,7 @@ private:
Ice::Inst *convertIntToPtrInstruction(const IntToPtrInst *Inst) { Ice::Inst *convertIntToPtrInstruction(const IntToPtrInst *Inst) {
Ice::Operand *Src = convertOperand(Inst, 0); Ice::Operand *Src = convertOperand(Inst, 0);
Ice::Variable *Dest = Ice::Variable *Dest = mapValueToIceVar(Inst, Ice::getPointerType());
mapValueToIceVar(Inst, TypeConverter.getIcePointerType());
return Ice::InstAssign::create(Func, Dest, Src); return Ice::InstAssign::create(Func, Dest, Src);
} }
...@@ -568,8 +567,7 @@ private: ...@@ -568,8 +567,7 @@ private:
// PNaCl bitcode only contains allocas of byte-granular objects. // PNaCl bitcode only contains allocas of byte-granular objects.
Ice::Operand *ByteCount = convertValue(Inst->getArraySize()); Ice::Operand *ByteCount = convertValue(Inst->getArraySize());
uint32_t Align = Inst->getAlignment(); uint32_t Align = Inst->getAlignment();
Ice::Variable *Dest = Ice::Variable *Dest = mapValueToIceVar(Inst, Ice::getPointerType());
mapValueToIceVar(Inst, TypeConverter.getIcePointerType());
return Ice::InstAlloca::create(Func, ByteCount, Align, Dest); return Ice::InstAlloca::create(Func, ByteCount, Align, Dest);
} }
...@@ -766,7 +764,7 @@ void LLVM2ICEGlobalsConverter::addGlobalInitializer( ...@@ -766,7 +764,7 @@ void LLVM2ICEGlobalsConverter::addGlobalInitializer(
return; return;
case Instruction::PtrToInt: { case Instruction::PtrToInt: {
assert(TypeConverter.convertToIceType(Exp->getType()) == assert(TypeConverter.convertToIceType(Exp->getType()) ==
TypeConverter.getIcePointerType()); Ice::getPointerType());
const auto GV = dyn_cast<GlobalValue>(Exp->getOperand(0)); const auto GV = dyn_cast<GlobalValue>(Exp->getOperand(0));
assert(GV); assert(GV);
const Ice::GlobalDeclaration *Addr = const Ice::GlobalDeclaration *Addr =
......
src/IceTypeConverter.cpp
...@@ -20,26 +20,29 @@ namespace Ice { ...@@ -20,26 +20,29 @@ namespace Ice {
TypeConverter::TypeConverter(llvm::LLVMContext &Context) { TypeConverter::TypeConverter(llvm::LLVMContext &Context) {
addLLVMType(IceType_void, llvm::Type::getVoidTy(Context)); addLLVMType(IceType_void, llvm::Type::getVoidTy(Context));
addLLVMType(IceType_i1, llvm::IntegerType::get(Context, 1)); llvm::Type *Type_i1 = llvm::IntegerType::get(Context, 1);
addLLVMType(IceType_i8, llvm::IntegerType::get(Context, 8)); llvm::Type *Type_i8 = llvm::IntegerType::get(Context, 8);
addLLVMType(IceType_i16, llvm::IntegerType::get(Context, 16)); llvm::Type *Type_i16 = llvm::IntegerType::get(Context, 16);
addLLVMType(IceType_i32, llvm::IntegerType::get(Context, 32)); llvm::Type *Type_i32 = llvm::IntegerType::get(Context, 32);
llvm::Type *Type_f32 = llvm::Type::getFloatTy(Context);
addLLVMType(IceType_i1, Type_i1);
addLLVMType(IceType_i8, Type_i8);
addLLVMType(IceType_i16, Type_i16);
addLLVMType(IceType_i32, Type_i32);
addLLVMType(IceType_i64, llvm::IntegerType::get(Context, 64)); addLLVMType(IceType_i64, llvm::IntegerType::get(Context, 64));
addLLVMType(IceType_f32, llvm::Type::getFloatTy(Context)); addLLVMType(IceType_f32, Type_f32);
addLLVMType(IceType_f64, llvm::Type::getDoubleTy(Context)); addLLVMType(IceType_f64, llvm::Type::getDoubleTy(Context));
addLLVMType(IceType_v4i1, llvm::VectorType::get(LLVMTypes[IceType_i1], 4)); addLLVMType(IceType_v4i1, llvm::VectorType::get(Type_i1, 4));
addLLVMType(IceType_v8i1, llvm::VectorType::get(LLVMTypes[IceType_i1], 8)); addLLVMType(IceType_v8i1, llvm::VectorType::get(Type_i1, 8));
addLLVMType(IceType_v16i1, llvm::VectorType::get(LLVMTypes[IceType_i1], 16)); addLLVMType(IceType_v16i1, llvm::VectorType::get(Type_i1, 16));
addLLVMType(IceType_v16i8, llvm::VectorType::get(LLVMTypes[IceType_i8], 16)); addLLVMType(IceType_v16i8, llvm::VectorType::get(Type_i8, 16));
addLLVMType(IceType_v8i16, llvm::VectorType::get(LLVMTypes[IceType_i16], 8)); addLLVMType(IceType_v8i16, llvm::VectorType::get(Type_i16, 8));
addLLVMType(IceType_v4i32, llvm::VectorType::get(LLVMTypes[IceType_i32], 4)); addLLVMType(IceType_v4i32, llvm::VectorType::get(Type_i32, 4));
addLLVMType(IceType_v4f32, llvm::VectorType::get(LLVMTypes[IceType_f32], 4)); addLLVMType(IceType_v4f32, llvm::VectorType::get(Type_f32, 4));
assert(LLVMTypes.size() == static_cast<size_t>(IceType_NUM)); assert(LLVM2IceMap.size() == static_cast<size_t>(IceType_NUM));
} }
void TypeConverter::addLLVMType(Type Ty, llvm::Type *LLVMTy) { void TypeConverter::addLLVMType(Type Ty, llvm::Type *LLVMTy) {
assert(static_cast<size_t>(Ty) == LLVMTypes.size());
LLVMTypes.push_back(LLVMTy);
LLVM2IceMap[LLVMTy] = Ty; LLVM2IceMap[LLVMTy] = Ty;
} }
...@@ -47,7 +50,7 @@ Type TypeConverter::convertToIceTypeOther(llvm::Type *LLVMTy) const { ...@@ -47,7 +50,7 @@ Type TypeConverter::convertToIceTypeOther(llvm::Type *LLVMTy) const {
switch (LLVMTy->getTypeID()) { switch (LLVMTy->getTypeID()) {
case llvm::Type::PointerTyID: case llvm::Type::PointerTyID:
case llvm::Type::FunctionTyID: case llvm::Type::FunctionTyID:
return getIcePointerType(); return getPointerType();
default: default:
return Ice::IceType_NUM; return Ice::IceType_NUM;
} }
......
src/IceTypeConverter.h
...@@ -35,12 +35,6 @@ public: ...@@ -35,12 +35,6 @@ public:
/// Context is the context to use to build llvm types. /// Context is the context to use to build llvm types.
TypeConverter(llvm::LLVMContext &Context); TypeConverter(llvm::LLVMContext &Context);
/// Returns the LLVM type for the corresponding ICE type Ty.
llvm::Type *convertToLLVMType(Type Ty) const {
// Note: We use "at" here in case Ty wasn't registered.
return LLVMTypes.at(Ty);
}
/// Converts LLVM type LLVMTy to an ICE type. Returns /// Converts LLVM type LLVMTy to an ICE type. Returns
/// Ice::IceType_NUM if unable to convert. /// Ice::IceType_NUM if unable to convert.
Type convertToIceType(llvm::Type *LLVMTy) const { Type convertToIceType(llvm::Type *LLVMTy) const {
...@@ -50,13 +44,8 @@ public: ...@@ -50,13 +44,8 @@ public:
return Pos->second; return Pos->second;
} }
/// Returns ICE model of pointer type.
Type getIcePointerType() const { return IceType_i32; }
private: private:
// The list of allowable LLVM types. Indexed by ICE type. // The mapping from LLVM types to corresopnding Ice types.
std::vector<llvm::Type *> LLVMTypes;
// The inverse mapping of LLVMTypes.
std::map<llvm::Type *, Type> LLVM2IceMap; std::map<llvm::Type *, Type> LLVM2IceMap;
// Add LLVM/ICE pair to internal tables. // Add LLVM/ICE pair to internal tables.
......
src/IceTypes.h
...@@ -53,6 +53,8 @@ size_t typeNumElements(Type Ty); ...@@ -53,6 +53,8 @@ size_t typeNumElements(Type Ty);
Type typeElementType(Type Ty); Type typeElementType(Type Ty);
const char *typeString(Type Ty); const char *typeString(Type Ty);
inline Type getPointerType() { return IceType_i32; }
bool isVectorType(Type Ty); bool isVectorType(Type Ty);
bool isIntegerType(Type Ty); // scalar or vector bool isIntegerType(Type Ty); // scalar or vector
......
src/PNaClTranslator.cpp
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include "llvm/Bitcode/NaCl/NaClBitcodeHeader.h" #include "llvm/Bitcode/NaCl/NaClBitcodeHeader.h"
#include "llvm/Bitcode/NaCl/NaClBitcodeParser.h" #include "llvm/Bitcode/NaCl/NaClBitcodeParser.h"
#include "llvm/Bitcode/NaCl/NaClReaderWriter.h" #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
...@@ -32,7 +30,6 @@ ...@@ -32,7 +30,6 @@
#include "IceGlobalInits.h" #include "IceGlobalInits.h"
#include "IceInst.h" #include "IceInst.h"
#include "IceOperand.h" #include "IceOperand.h"
#include "IceTypeConverter.h"
#include "PNaClTranslator.h" #include "PNaClTranslator.h"
#include <memory> #include <memory>
...@@ -170,14 +167,11 @@ class TopLevelParser : public NaClBitcodeParser { ...@@ -170,14 +167,11 @@ class TopLevelParser : public NaClBitcodeParser {
public: public:
typedef std::vector<Ice::FunctionDeclaration *> FunctionDeclarationListType; typedef std::vector<Ice::FunctionDeclaration *> FunctionDeclarationListType;
TopLevelParser(Ice::Translator &Translator, const std::string &InputName, TopLevelParser(Ice::Translator &Translator, NaClBitcodeHeader &Header,
NaClBitcodeHeader &Header, NaClBitstreamCursor &Cursor, NaClBitstreamCursor &Cursor, bool &ErrorStatus)
bool &ErrorStatus) : NaClBitcodeParser(Cursor), Translator(Translator), Header(Header),
: NaClBitcodeParser(Cursor), Translator(Translator), ErrorStatus(ErrorStatus), NumErrors(0), NumFunctionIds(0),
Mod(new Module(InputName, getGlobalContext())), Header(Header), NumFunctionBlocks(0), BlockParser(nullptr) {
TypeConverter(Mod->getContext()), ErrorStatus(ErrorStatus),
NumErrors(0), NumFunctionIds(0), NumFunctionBlocks(0),
BlockParser(nullptr) {
setErrStream(Translator.getContext()->getStrDump()); setErrStream(Translator.getContext()->getStrDump());
} }
...@@ -199,9 +193,6 @@ public: ...@@ -199,9 +193,6 @@ public:
/// file. /// file.
unsigned getNumErrors() const { return NumErrors; } unsigned getNumErrors() const { return NumErrors; }
/// Returns the LLVM module associated with the translation.
Module *getModule() const { return Mod.get(); }
/// Returns the number of bytes in the bitcode header. /// Returns the number of bytes in the bitcode header.
size_t getHeaderSize() const { return Header.getHeaderSize(); } size_t getHeaderSize() const { return Header.getHeaderSize(); }
...@@ -377,34 +368,11 @@ public: ...@@ -377,34 +368,11 @@ public:
return VariableDeclarations; return VariableDeclarations;
} }
/// Returns the corresponding ICE type for LLVMTy.
Ice::Type convertToIceType(Type *LLVMTy) {
Ice::Type IceTy = TypeConverter.convertToIceType(LLVMTy);
if (IceTy >= Ice::IceType_NUM) {
return convertToIceTypeError(LLVMTy);
}
return IceTy;
}
/// Returns the corresponding LLVM type for IceTy.
Type *convertToLLVMType(Ice::Type IceTy) const {
return TypeConverter.convertToLLVMType(IceTy);
}
/// Returns the model for pointer types in ICE.
Ice::Type getIcePointerType() const {
return TypeConverter.getIcePointerType();
}
private: private:
// The translator associated with the parser. // The translator associated with the parser.
Ice::Translator &Translator; Ice::Translator &Translator;
// The parsed module.
std::unique_ptr<Module> Mod;
// The bitcode header. // The bitcode header.
NaClBitcodeHeader &Header; NaClBitcodeHeader &Header;
// Converter between LLVM and ICE types.
Ice::TypeConverter TypeConverter;
// The exit status that should be set to true if an error occurs. // The exit status that should be set to true if an error occurs.
bool &ErrorStatus; bool &ErrorStatus;
// The number of errors reported. // The number of errors reported.
...@@ -1407,7 +1375,7 @@ private: ...@@ -1407,7 +1375,7 @@ private:
// the given InstructionName. Returns true if valid. Otherwise // the given InstructionName. Returns true if valid. Otherwise
// generates an error message and returns false. // generates an error message and returns false.
bool isValidPointerType(Ice::Operand *Op, const char *InstructionName) { bool isValidPointerType(Ice::Operand *Op, const char *InstructionName) {
Ice::Type PtrType = Context->getIcePointerType(); Ice::Type PtrType = Ice::getPointerType();
if (Op->getType() == PtrType) if (Op->getType() == PtrType)
return true; return true;
std::string Buffer; std::string Buffer;
...@@ -2365,7 +2333,7 @@ void FunctionParser::ProcessRecord() { ...@@ -2365,7 +2333,7 @@ void FunctionParser::ProcessRecord() {
setNextLocalInstIndex(nullptr); setNextLocalInstIndex(nullptr);
return; return;
} }
Ice::Type PtrTy = Context->getIcePointerType(); Ice::Type PtrTy = Ice::getPointerType();
if (ByteCount->getType() != Ice::IceType_i32) { if (ByteCount->getType() != Ice::IceType_i32) {
std::string Buffer; std::string Buffer;
raw_string_ostream StrBuf(Buffer); raw_string_ostream StrBuf(Buffer);
...@@ -2655,9 +2623,8 @@ void ConstantsParser::ProcessRecord() { ...@@ -2655,9 +2623,8 @@ void ConstantsParser::ProcessRecord() {
FuncParser->setNextConstantID(nullptr); FuncParser->setNextConstantID(nullptr);
return; return;
} }
if (auto IType = dyn_cast<IntegerType>( if (Ice::isScalarIntegerType(NextConstantType)) {
Context->convertToLLVMType(NextConstantType))) { Ice::APInt Value(Ice::getScalarIntBitWidth(NextConstantType),
Ice::APInt Value(IType->getBitWidth(),
NaClDecodeSignRotatedValue(Values[0])); NaClDecodeSignRotatedValue(Values[0]));
if (Ice::Constant *C = getContext()->getConstantInt( if (Ice::Constant *C = getContext()->getConstantInt(
NextConstantType, Value.getSExtValue())) { NextConstantType, Value.getSExtValue())) {
...@@ -3022,8 +2989,7 @@ void PNaClTranslator::translate(const std::string &IRFilename) { ...@@ -3022,8 +2989,7 @@ void PNaClTranslator::translate(const std::string &IRFilename) {
NaClBitstreamReader InputStreamFile(BufPtr, EndBufPtr); NaClBitstreamReader InputStreamFile(BufPtr, EndBufPtr);
NaClBitstreamCursor InputStream(InputStreamFile); NaClBitstreamCursor InputStream(InputStreamFile);
TopLevelParser Parser(*this, MemBuf->getBufferIdentifier(), Header, TopLevelParser Parser(*this, Header, InputStream, ErrorStatus);
InputStream, ErrorStatus);
int TopLevelBlocks = 0; int TopLevelBlocks = 0;
while (!InputStream.AtEndOfStream()) { while (!InputStream.AtEndOfStream()) {
if (Parser.Parse()) { if (Parser.Parse()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment