aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove several redundant #if - clauses

Browse Source
This commit is contained in:
Anton Mitrokhin
2015-06-17 14:07:51 +03:00
parent 0afa3f5713
commit ebc47d00a1
19 changed files with 273 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
builtins.cpp
View File

@@ -47,10 +47,8 @@
#include <math.h>
#include <stdlib.h>
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
#if ISPC_LLVM_VERSION == ISPC_LLVM_3_2
#include <llvm/Attributes.h>
#endif
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
#include <llvm/LLVMContext.h>
#include <llvm/Module.h>
#include <llvm/Type.h>
@@ -784,7 +782,7 @@ void
AddBitcodeToModule(const unsigned char *bitcode, int length,
llvm::Module *module, SymbolTable *symbolTable, bool warn) {
llvm::StringRef sb = llvm::StringRef((char *)bitcode, length);
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_6
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
llvm::MemoryBuffer *bcBuf = llvm::MemoryBuffer::getMemBuffer(sb);
#else // LLVM 3.6+
llvm::MemoryBufferRef bcBuf = llvm::MemoryBuffer::getMemBuffer(sb)->getMemBufferRef();
@@ -880,7 +878,7 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
std::string(linkError);
if (llvm::Linker::LinkModules(module, bcModule
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_6
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
, llvm::Linker::DestroySource,
&linkError))
Error(SourcePos(), "Error linking stdlib bitcode: %s", linkError.c_str());
@@ -917,7 +915,7 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
symbolTable->AddVariable(sym);
if (m->diBuilder != NULL) {
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
llvm::DIFile file;
llvm::DIType diType = sym->type->GetDIType(file);
Assert(diType.Verify());
@@ -932,7 +930,7 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
// have the DW_AT_artifical attribute. It's not clear if this
// matters for anything though.
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_6
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
name,
file,
@@ -940,7 +938,7 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
diType,
true /* static */,
sym->storagePtr);
#elif ISPC_LLVM_VERSION < ISPC_LLVM_3_7 /* i.e., 3.6 */
#elif ISPC_LLVM_VERSION == ISPC_LLVM_3_6 // LLVM 3.6
llvm::Constant *sym_const_storagePtr = llvm::dyn_cast<llvm::Constant>(sym->storagePtr);
Assert(sym_const_storagePtr);
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
@@ -965,7 +963,7 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
true /* static */,
sym_const_storagePtr);
#endif
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
Assert(var.Verify());
#else // LLVM 3.7+
//coming soon
@@ -984,7 +982,7 @@ lDefineConstantIntFunc(const char *name, int val, llvm::Module *module,
llvm::Function *func = module->getFunction(name);
Assert(func != NULL); // it should be declared already...
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
#if ISPC_LLVM_VERSION == ISPC_LLVM_3_2
func->addFnAttr(llvm::Attributes::AlwaysInline);
#else // LLVM 3.3+
func->addFnAttr(llvm::Attribute::AlwaysInline);
@@ -1019,7 +1017,7 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
symbolTable->AddVariable(sym);
if (m->diBuilder != NULL) {
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
llvm::DIFile file;
llvm::DIType diType = sym->type->GetDIType(file);
Assert(diType.Verify());
@@ -1030,13 +1028,10 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
llvm::DIType *diType = sym->type->GetDIType(file);
// Assert(diType.Verify());
#endif
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_6
#if ISPC_LLVM_VERSION == ISPC_LLVM_3_6 // LLVM 3.6
llvm::Constant *sym_const_storagePtr = llvm::dyn_cast<llvm::Constant>(sym->storagePtr);
Assert(sym_const_storagePtr);
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_7
llvm::DIGlobalVariable var =
#endif
m->diBuilder->createGlobalVariable(
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
file,
sym->name.c_str(),
sym->name.c_str(),
@@ -1045,7 +1040,7 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
diType,
false /* static */,
sym_const_storagePtr);
#elif ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 /* && ISPC_LLVM_VERSION < ISPC_LLVM_3_6 */
#elif ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
sym->name.c_str(),
file,
@@ -1053,7 +1048,7 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
diType,
false /* static */,
sym->storagePtr);
#else
#else // LLVM 3.7+
llvm::Constant *sym_const_storagePtr = llvm::dyn_cast<llvm::Constant>(sym->storagePtr);
Assert(sym_const_storagePtr);
m->diBuilder->createGlobalVariable(
@@ -1065,8 +1060,8 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
diType,
false /* static */,
sym_const_storagePtr);
#endif
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
#endif
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
Assert(var.Verify());
#else // LLVM 3.7+
//coming soon