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

ToT Fixes / M4 macro fix

Browse Source
This commit is contained in:
james.brodman
2013-01-14 14:55:10 -05:00
parent 8f902fde9c
commit 3aaf2ef2d4
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -24,10 +24,8 @@ LLVM_LIBS=$(shell $(LLVM_CONFIG) --libs)
CLANG=clang CLANG=clang
CLANG_LIBS = -lclangFrontend -lclangDriver \ CLANG_LIBS = -lclangFrontend -lclangDriver \
-lclangSerialization -lclangParse -lclangSema \ -lclangSerialization -lclangParse -lclangSema \
-lclangAnalysis -lclangAST -lclangLex -lclangBasic -lclangAnalysis -lclangAST -lclangBasic \
ifneq ($(shell $(LLVM_CONFIG) --version), 3.0) -lclangEdit -lclangLex
CLANG_LIBS += -lclangEdit
endif
ISPC_LIBS=$(shell $(LLVM_CONFIG) --ldflags) $(CLANG_LIBS) $(LLVM_LIBS) \ ISPC_LIBS=$(shell $(LLVM_CONFIG) --ldflags) $(CLANG_LIBS) $(LLVM_LIBS) \
-lpthread -lpthread

12
builtins/util.m4
View File

@@ -3295,7 +3295,7 @@ check_neighbors:
%castvec = bitcast <$1 x $2> %vec to <$1 x $4> %castvec = bitcast <$1 x $2> %vec to <$1 x $4>
%castvr = call <$1 x $4> @__rotate_i$6(<$1 x $4> %castvec, i32 1) %castvr = call <$1 x $4> @__rotate_i$6(<$1 x $4> %castvec, i32 1)
%vr = bitcast <$1 x $4> %castvr to <$1 x $2> %vr = bitcast <$1 x $4> %castvr to <$1 x $2>
%eq = $5 eq <$1 x $2> %vec, %vr %eq = $5 $7 <$1 x $2> %vec, %vr
ifelse(MASK,i32, ` ifelse(MASK,i32, `
%eq32 = sext <$1 x i1> %eq to <$1 x i32> %eq32 = sext <$1 x i1> %eq to <$1 x i32>
%eqmm = call i64 @__movmsk(<$1 x i32> %eq32)', ` %eqmm = call i64 @__movmsk(<$1 x i32> %eq32)', `
@@ -3310,7 +3310,7 @@ check_neighbors:
%v`'i = extractelement <$1 x $2> %vec, i32 i') %v`'i = extractelement <$1 x $2> %vec, i32 i')
forloop(i, 0, eval($1-2), ` forloop(i, 0, eval($1-2), `
%eq`'i = $5 eq $2 %v`'i, %v`'eval(i+1)') %eq`'i = $5 $7 $2 %v`'i, %v`'eval(i+1)')
%and0 = and i1 %eq0, %eq1 %and0 = and i1 %eq0, %eq1
forloop(i, 1, eval($1-3), ` forloop(i, 1, eval($1-3), `
@@ -3330,10 +3330,10 @@ not_all_equal:
') ')
define(`reduce_equal', ` define(`reduce_equal', `
reduce_equal_aux($1, i32, int32, i32, icmp, 32) reduce_equal_aux($1, i32, int32, i32, icmp, 32, eq)
reduce_equal_aux($1, float, float, i32, fcmp, 32) reduce_equal_aux($1, float, float, i32, fcmp, 32, oeq)
reduce_equal_aux($1, i64, int64, i64, icmp, 64) reduce_equal_aux($1, i64, int64, i64, icmp, 64, eq)
reduce_equal_aux($1, double, double, i64, fcmp, 64) reduce_equal_aux($1, double, double, i64, fcmp, 64, oeq)
') ')
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

4
cbackend.cpp
View File

@@ -51,7 +51,11 @@
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/PassManager.h" #include "llvm/PassManager.h"
#if !defined(LLVM_3_1) #if !defined(LLVM_3_1)
#if defined(LLVM_3_2)
#include "llvm/TypeFinder.h" #include "llvm/TypeFinder.h"
#else // LLVM_3_3 +
#include "llvm/IR/TypeFinder.h"
#endif
#endif // LLVM_3_2 + #endif // LLVM_3_2 +
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"

3
module.cpp
View File

@@ -91,10 +91,11 @@
#else #else
#if defined(LLVM_3_2) #if defined(LLVM_3_2)
#include <llvm/DataLayout.h> #include <llvm/DataLayout.h>
#include <llvm/TargetTransformInfo.h>
#else // LLVM 3.3+ #else // LLVM 3.3+
#include <llvm/IR/DataLayout.h> #include <llvm/IR/DataLayout.h>
#include <llvm/Analysis/TargetTransformInfo.h>
#endif #endif
#include <llvm/TargetTransformInfo.h>
#endif #endif
#include <llvm/Analysis/Verifier.h> #include <llvm/Analysis/Verifier.h>
#include <llvm/Support/CFG.h> #include <llvm/Support/CFG.h>

5
opt.cpp
View File

@@ -79,7 +79,7 @@
#include <llvm/DataLayout.h> #include <llvm/DataLayout.h>
#else // LLVM 3.3+ #else // LLVM 3.3+
#include <llvm/IR/DataLayout.h> #include <llvm/IR/DataLayout.h>
#include <llvm/TargetTransformInfo.h> #include <llvm/Analysis/TargetTransformInfo.h>
#endif #endif
#include <llvm/Target/TargetMachine.h> #include <llvm/Target/TargetMachine.h>
#include <llvm/Analysis/Verifier.h> #include <llvm/Analysis/Verifier.h>
@@ -426,8 +426,7 @@ Optimize(llvm::Module *module, int optLevel) {
optPM.add(new llvm::TargetTransformInfo(targetMachine->getScalarTargetTransformInfo(), optPM.add(new llvm::TargetTransformInfo(targetMachine->getScalarTargetTransformInfo(),
targetMachine->getVectorTargetTransformInfo())); targetMachine->getVectorTargetTransformInfo()));
#else // LLVM 3.3+ #else // LLVM 3.3+
optPM.add(llvm::createNoTTIPass(targetMachine->getScalarTargetTransformInfo(), targetMachine->addAnalysisPasses(optPM);
targetMachine->getVectorTargetTransformInfo()));
#endif #endif
#endif #endif