[polly] r214659 - Fix the modifiable access creation
Johannes Doerfert
jdoerfert at codeaurora.org
Sat Aug 2 18:52:00 PDT 2014
Author: jdoerfert
Date: Sat Aug 2 20:51:59 2014
New Revision: 214659
URL: http://llvm.org/viewvc/llvm-project?rev=214659&view=rev
Log:
Fix the modifiable access creation
+ Remove the class IslGenerator which duplicates the functionality of
IslExprBuilder.
+ Use the IslExprBuilder to create code for memory access relations.
+ Also handle array types during access creation.
+ Enable scev codegen for one of the transformed memory access tests,
thus access creation without canonical induction variables available.
+ Update one test case to the new output.
Modified:
polly/trunk/include/polly/CodeGen/BlockGenerators.h
polly/trunk/include/polly/CodeGen/IslAst.h
polly/trunk/include/polly/ScopInfo.h
polly/trunk/lib/CodeGen/BlockGenerators.cpp
polly/trunk/lib/CodeGen/IslAst.cpp
polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
polly/trunk/lib/CodeGen/IslExprBuilder.cpp
polly/trunk/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll
Modified: polly/trunk/include/polly/CodeGen/BlockGenerators.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/BlockGenerators.h?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/include/polly/CodeGen/BlockGenerators.h (original)
+++ polly/trunk/include/polly/CodeGen/BlockGenerators.h Sat Aug 2 20:51:59 2014
@@ -24,6 +24,8 @@
#include <vector>
+struct isl_ast_build;
+
namespace llvm {
class Pass;
class Region;
@@ -35,6 +37,8 @@ extern bool SCEVCodegen;
using namespace llvm;
class ScopStmt;
+class MemoryAccess;
+class IslExprBuilder;
typedef DenseMap<const Value *, Value *> ValueMapT;
typedef std::vector<ValueMapT> VectorValueMapT;
@@ -63,16 +67,22 @@ class BlockGenerator {
public:
/// @brief Generate a new BasicBlock for a ScopStmt.
///
- /// @param Builder The LLVM-IR Builder used to generate the statement. The
- /// code is generated at the location, the Builder points to.
- /// @param Stmt The statement to code generate.
- /// @param GlobalMap A map that defines for certain Values referenced from the
- /// original code new Values they should be replaced with.
- /// @param P A reference to the pass this function is called from.
- /// The pass is needed to update other analysis.
+ /// @param Builder The LLVM-IR Builder used to generate the statement. The
+ /// code is generated at the location, the Builder points
+ /// to.
+ /// @param Stmt The statement to code generate.
+ /// @param GlobalMap A map that defines for certain Values referenced from
+ /// the original code new Values they should be replaced
+ /// with.
+ /// @param P A reference to the pass this function is called from.
+ /// The pass is needed to update other analysis.
+ /// @param Build The AST build with the new schedule.
+ /// @param ExprBuilder An expression builder to generate new access functions.
static void generate(PollyIRBuilder &Builder, ScopStmt &Stmt,
- ValueMapT &GlobalMap, LoopToScevMapT <S, Pass *P) {
- BlockGenerator Generator(Builder, Stmt, P);
+ ValueMapT &GlobalMap, LoopToScevMapT <S, Pass *P,
+ __isl_keep isl_ast_build *Build = nullptr,
+ IslExprBuilder *ExprBuilder = nullptr) {
+ BlockGenerator Generator(Builder, Stmt, P, Build, ExprBuilder);
Generator.copyBB(GlobalMap, LTS);
}
@@ -81,8 +91,11 @@ protected:
ScopStmt &Statement;
Pass *P;
ScalarEvolution &SE;
+ isl_ast_build *Build;
+ IslExprBuilder *ExprBuilder;
- BlockGenerator(PollyIRBuilder &B, ScopStmt &Stmt, Pass *P);
+ BlockGenerator(PollyIRBuilder &B, ScopStmt &Stmt, Pass *P,
+ __isl_keep isl_ast_build *Build, IslExprBuilder *ExprBuilder);
/// @brief Get the new version of a Value.
///
@@ -128,25 +141,8 @@ protected:
/// @return The innermost loop that surrounds the instruction.
Loop *getLoopForInst(const Instruction *Inst);
- /// @brief Get the memory access offset to be added to the base address
- ///
- /// @param L The loop that surrounded the instruction that referenced this
- /// memory subscript in the original code.
- std::vector<Value *> getMemoryAccessIndex(__isl_keep isl_map *AccessRelation,
- Value *BaseAddress,
- ValueMapT &BBMap,
- ValueMapT &GlobalMap,
- LoopToScevMapT <S, Loop *L);
-
- /// @brief Get the new operand address according to the changed access in
- /// JSCOP file.
- ///
- /// @param L The loop that surrounded the instruction that used this operand
- /// in the original code.
- Value *getNewAccessOperand(__isl_keep isl_map *NewAccessRelation,
- Value *BaseAddress, ValueMapT &BBMap,
- ValueMapT &GlobalMap, LoopToScevMapT <S,
- Loop *L);
+ /// @brief Get the new operand address according to access relation of @p MA.
+ Value *getNewAccessOperand(const MemoryAccess &MA);
/// @brief Generate the operand address
Value *generateLocationAccessed(const Instruction *Inst, const Value *Pointer,
Modified: polly/trunk/include/polly/CodeGen/IslAst.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/IslAst.h?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/include/polly/CodeGen/IslAst.h (original)
+++ polly/trunk/include/polly/CodeGen/IslAst.h Sat Aug 2 20:51:59 2014
@@ -129,6 +129,9 @@ public:
/// @brief Get the nodes broken reductions or a nullptr if not available.
static MemoryAccessSet *getBrokenReductions(__isl_keep isl_ast_node *Node);
+ /// @brief Get the nodes build context or a nullptr if not available.
+ static __isl_give isl_ast_build *getBuild(__isl_keep isl_ast_node *Node);
+
///}
virtual void getAnalysisUsage(AnalysisUsage &AU) const;
Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Sat Aug 2 20:51:59 2014
@@ -231,7 +231,7 @@ public:
ReductionType getReductionType() const { return RedType; }
/// @brief Set the updated access relation read from JSCOP file.
- void setNewAccessRelation(isl_map *newAccessRelation);
+ void setNewAccessRelation(__isl_take isl_map *newAccessRelation);
/// @brief Mark this a reduction like access
void markAsReductionLike(ReductionType RT) { RedType = RT; }
Modified: polly/trunk/lib/CodeGen/BlockGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/BlockGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/BlockGenerators.cpp Sat Aug 2 20:51:59 2014
@@ -15,9 +15,12 @@
#include "polly/ScopInfo.h"
#include "isl/aff.h"
+#include "isl/ast.h"
+#include "isl/ast_build.h"
#include "isl/set.h"
#include "polly/CodeGen/BlockGenerators.h"
#include "polly/CodeGen/CodeGeneration.h"
+#include "polly/CodeGen/IslExprBuilder.h"
#include "polly/Options.h"
#include "polly/Support/GICHelper.h"
#include "polly/Support/SCEVValidator.h"
@@ -63,103 +66,11 @@ bool polly::canSynthesize(const Instruct
return L && I == L->getCanonicalInductionVariable() && R->contains(L);
}
-// Helper class to generate memory location.
-namespace {
-class IslGenerator {
-public:
- IslGenerator(PollyIRBuilder &Builder, std::vector<Value *> &IVS)
- : Builder(Builder), IVS(IVS) {}
- Value *generateIslVal(__isl_take isl_val *Val);
- Value *generateIslAff(__isl_take isl_aff *Aff);
- Value *generateIslPwAff(__isl_take isl_pw_aff *PwAff);
-
-private:
- typedef struct {
- Value *Result;
- class IslGenerator *Generator;
- } IslGenInfo;
-
- PollyIRBuilder &Builder;
- std::vector<Value *> &IVS;
- static int mergeIslAffValues(__isl_take isl_set *Set, __isl_take isl_aff *Aff,
- void *User);
-};
-}
-
-Value *IslGenerator::generateIslVal(__isl_take isl_val *Val) {
- Value *IntValue = Builder.getInt(APIntFromVal(Val));
- return IntValue;
-}
-
-Value *IslGenerator::generateIslAff(__isl_take isl_aff *Aff) {
- Value *Result;
- Value *ConstValue;
- isl_val *Val;
-
- Val = isl_aff_get_constant_val(Aff);
- ConstValue = generateIslVal(Val);
- Type *Ty = Builder.getInt64Ty();
-
- // FIXME: We should give the constant and coefficients the right type. Here
- // we force it into i64.
- Result = Builder.CreateSExtOrBitCast(ConstValue, Ty);
-
- unsigned int NbInputDims = isl_aff_dim(Aff, isl_dim_in);
-
- assert((IVS.size() == NbInputDims) &&
- "The Dimension of Induction Variables must match the dimension of the "
- "affine space.");
-
- for (unsigned int i = 0; i < NbInputDims; ++i) {
- Value *CoefficientValue;
- Val = isl_aff_get_coefficient_val(Aff, isl_dim_in, i);
-
- if (isl_val_is_zero(Val)) {
- isl_val_free(Val);
- continue;
- }
-
- CoefficientValue = generateIslVal(Val);
- CoefficientValue = Builder.CreateIntCast(CoefficientValue, Ty, true);
- Value *IV = Builder.CreateIntCast(IVS[i], Ty, true);
- Value *PAdd = Builder.CreateMul(CoefficientValue, IV, "p_mul_coeff");
- Result = Builder.CreateAdd(Result, PAdd, "p_sum_coeff");
- }
-
- isl_aff_free(Aff);
-
- return Result;
-}
-
-int IslGenerator::mergeIslAffValues(__isl_take isl_set *Set,
- __isl_take isl_aff *Aff, void *User) {
- IslGenInfo *GenInfo = (IslGenInfo *)User;
-
- assert((GenInfo->Result == nullptr) &&
- "Result is already set. Currently only single isl_aff is supported");
- assert(isl_set_plain_is_universe(Set) &&
- "Code generation failed because the set is not universe");
-
- GenInfo->Result = GenInfo->Generator->generateIslAff(Aff);
-
- isl_set_free(Set);
- return 0;
-}
-
-Value *IslGenerator::generateIslPwAff(__isl_take isl_pw_aff *PwAff) {
- IslGenInfo User;
- User.Result = nullptr;
- User.Generator = this;
- isl_pw_aff_foreach_piece(PwAff, mergeIslAffValues, &User);
- assert(User.Result && "Code generation for isl_pw_aff failed");
-
- isl_pw_aff_free(PwAff);
- return User.Result;
-}
-
-BlockGenerator::BlockGenerator(PollyIRBuilder &B, ScopStmt &Stmt, Pass *P)
- : Builder(B), Statement(Stmt), P(P), SE(P->getAnalysis<ScalarEvolution>()) {
-}
+BlockGenerator::BlockGenerator(PollyIRBuilder &B, ScopStmt &Stmt, Pass *P,
+ isl_ast_build *Build,
+ IslExprBuilder *ExprBuilder)
+ : Builder(B), Statement(Stmt), P(P), SE(P->getAnalysis<ScalarEvolution>()),
+ Build(Build), ExprBuilder(ExprBuilder) {}
Value *BlockGenerator::lookupAvailableValue(const Value *Old, ValueMapT &BBMap,
ValueMapT &GlobalMap) const {
@@ -252,41 +163,30 @@ void BlockGenerator::copyInstScalar(cons
NewInst->setName("p_" + Inst->getName());
}
-std::vector<Value *> BlockGenerator::getMemoryAccessIndex(
- __isl_keep isl_map *AccessRelation, Value *BaseAddress, ValueMapT &BBMap,
- ValueMapT &GlobalMap, LoopToScevMapT <S, Loop *L) {
- assert((isl_map_dim(AccessRelation, isl_dim_out) == 1) &&
- "Only single dimensional access functions supported");
-
- std::vector<Value *> IVS;
- for (unsigned i = 0; i < Statement.getNumIterators(); ++i) {
- const Value *OriginalIV = Statement.getInductionVariableForDimension(i);
- Value *NewIV = getNewValue(OriginalIV, BBMap, GlobalMap, LTS, L);
- IVS.push_back(NewIV);
- }
+Value *BlockGenerator::getNewAccessOperand(const MemoryAccess &MA) {
+ isl_pw_multi_aff *PWSchedule, *PWAccRel;
+ isl_union_map *ScheduleU;
+ isl_map *Schedule, *AccRel;
+ isl_ast_expr *Expr;
+
+ assert(ExprBuilder && Build &&
+ "Cannot generate new value without IslExprBuilder!");
+
+ AccRel = MA.getNewAccessRelation();
+ assert(AccRel && "We generate new code only for new access relations!");
+
+ ScheduleU = isl_ast_build_get_schedule(Build);
+ ScheduleU = isl_union_map_intersect_domain(
+ ScheduleU, isl_union_set_from_set(MA.getStatement()->getDomain()));
+ Schedule = isl_map_from_union_map(ScheduleU);
+
+ PWSchedule = isl_pw_multi_aff_from_map(isl_map_reverse(Schedule));
+ PWAccRel = isl_pw_multi_aff_from_map(AccRel);
+ PWAccRel = isl_pw_multi_aff_pullback_pw_multi_aff(PWAccRel, PWSchedule);
+
+ Expr = isl_ast_build_access_from_pw_multi_aff(Build, PWAccRel);
- isl_pw_aff *PwAff = isl_map_dim_max(isl_map_copy(AccessRelation), 0);
- IslGenerator IslGen(Builder, IVS);
- Value *OffsetValue = IslGen.generateIslPwAff(PwAff);
-
- Type *Ty = Builder.getInt64Ty();
- OffsetValue = Builder.CreateIntCast(OffsetValue, Ty, true);
-
- std::vector<Value *> IndexArray;
- Value *NullValue = Constant::getNullValue(Ty);
- IndexArray.push_back(NullValue);
- IndexArray.push_back(OffsetValue);
- return IndexArray;
-}
-
-Value *BlockGenerator::getNewAccessOperand(
- __isl_keep isl_map *NewAccessRelation, Value *BaseAddress, ValueMapT &BBMap,
- ValueMapT &GlobalMap, LoopToScevMapT <S, Loop *L) {
- std::vector<Value *> IndexArray = getMemoryAccessIndex(
- NewAccessRelation, BaseAddress, BBMap, GlobalMap, LTS, L);
- Value *NewOperand =
- Builder.CreateGEP(BaseAddress, IndexArray, "p_newarrayidx_");
- return NewOperand;
+ return ExprBuilder->create(Expr);
}
Value *BlockGenerator::generateLocationAccessed(const Instruction *Inst,
@@ -294,26 +194,17 @@ Value *BlockGenerator::generateLocationA
ValueMapT &BBMap,
ValueMapT &GlobalMap,
LoopToScevMapT <S) {
- const MemoryAccess &Access = Statement.getAccessFor(Inst);
- isl_map *CurrentAccessRelation = Access.getAccessRelation();
- isl_map *NewAccessRelation = Access.getNewAccessRelation();
-
- assert(isl_map_has_equal_space(CurrentAccessRelation, NewAccessRelation) &&
- "Current and new access function use different spaces");
+ const MemoryAccess &MA = Statement.getAccessFor(Inst);
+ isl_map *NewAccRel = MA.getNewAccessRelation();
Value *NewPointer;
-
- if (!NewAccessRelation) {
+ if (NewAccRel)
+ NewPointer = getNewAccessOperand(MA);
+ else
NewPointer =
getNewValue(Pointer, BBMap, GlobalMap, LTS, getLoopForInst(Inst));
- } else {
- Value *BaseAddress = Access.getBaseAddr();
- NewPointer = getNewAccessOperand(NewAccessRelation, BaseAddress, BBMap,
- GlobalMap, LTS, getLoopForInst(Inst));
- }
- isl_map_free(CurrentAccessRelation);
- isl_map_free(NewAccessRelation);
+ isl_map_free(NewAccRel);
return NewPointer;
}
@@ -397,8 +288,8 @@ VectorBlockGenerator::VectorBlockGenerat
ScopStmt &Stmt,
__isl_keep isl_map *Schedule,
Pass *P)
- : BlockGenerator(B, Stmt, P), GlobalMaps(GlobalMaps), VLTS(VLTS),
- Schedule(Schedule) {
+ : BlockGenerator(B, Stmt, P, nullptr, nullptr), GlobalMaps(GlobalMaps),
+ VLTS(VLTS), Schedule(Schedule) {
assert(GlobalMaps.size() > 1 && "Only one vector lane found");
assert(Schedule && "No statement domain provided");
}
Modified: polly/trunk/lib/CodeGen/IslAst.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslAst.cpp?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslAst.cpp (original)
+++ polly/trunk/lib/CodeGen/IslAst.cpp Sat Aug 2 20:51:59 2014
@@ -413,6 +413,11 @@ IslAstInfo::getBrokenReductions(__isl_ke
return Payload ? &Payload->BrokenReductions : nullptr;
}
+isl_ast_build *IslAstInfo::getBuild(__isl_keep isl_ast_node *Node) {
+ IslAstUserPayload *Payload = getNodePayload(Node);
+ return Payload ? Payload->Build : nullptr;
+}
+
void IslAstInfo::printScop(raw_ostream &OS) const {
isl_ast_print_options *Options;
isl_ast_node *RootNode = getAst();
Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Sat Aug 2 20:51:59 2014
@@ -19,6 +19,7 @@
//
//===----------------------------------------------------------------------===//
#include "polly/Config/config.h"
+#include "polly/CodeGen/IslExprBuilder.h"
#include "polly/CodeGen/BlockGenerators.h"
#include "polly/CodeGen/CodeGeneration.h"
#include "polly/CodeGen/IslAst.h"
@@ -61,6 +62,8 @@ public:
: Builder(Builder), Annotator(Annotator), ExprBuilder(Builder, IDToValue),
P(P) {}
+ /// @brief Add the mappings from array id's to array llvm::Value's.
+ void addMemoryAccesses(Scop &S);
void addParameters(__isl_take isl_set *Context);
void create(__isl_take isl_ast_node *Node);
IslExprBuilder &getExprBuilder() { return ExprBuilder; }
@@ -485,8 +488,10 @@ void IslNodeBuilder::createUser(__isl_ta
isl_ast_expr_free(StmtExpr);
Stmt = (ScopStmt *)isl_id_get_user(Id);
+
createSubstitutions(Expr, Stmt, VMap, LTS);
- BlockGenerator::generate(Builder, *Stmt, VMap, LTS, P);
+ BlockGenerator::generate(Builder, *Stmt, VMap, LTS, P,
+ IslAstInfo::getBuild(User), &ExprBuilder);
isl_ast_node_free(User);
isl_id_free(Id);
@@ -545,6 +550,15 @@ void IslNodeBuilder::addParameters(__isl
isl_set_free(Context);
}
+void IslNodeBuilder::addMemoryAccesses(Scop &S) {
+ for (ScopStmt *Stmt : S)
+ for (MemoryAccess *MA : *Stmt) {
+ isl_id *Id = MA->getArrayId();
+ IDToValue[Id] = MA->getBaseAddr();
+ isl_id_free(Id);
+ }
+}
+
namespace {
class IslCodeGeneration : public ScopPass {
public:
@@ -570,6 +584,7 @@ public:
IslNodeBuilder NodeBuilder(Builder, Annotator, this);
Builder.SetInsertPoint(StartBlock->getSinglePredecessor()->begin());
+ NodeBuilder.addMemoryAccesses(S);
NodeBuilder.addParameters(S.getContext());
// Build condition that evaluates at run-time if all assumptions taken
// for the scop hold. If we detect some assumptions do not hold, the
Modified: polly/trunk/lib/CodeGen/IslExprBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslExprBuilder.cpp?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslExprBuilder.cpp (original)
+++ polly/trunk/lib/CodeGen/IslExprBuilder.cpp Sat Aug 2 20:51:59 2014
@@ -103,21 +103,38 @@ Value *IslExprBuilder::createOpAccess(is
assert(isl_ast_expr_get_op_n_arg(Expr) == 2 &&
"Multidimensional access functions are not supported yet");
- Value *Base = create(isl_ast_expr_get_op_arg(Expr, 0));
+ Value *Base, *IndexOp, *Zero, *Access;
+ SmallVector<Value *, 4> Indices;
+ Type *PtrElTy;
+
+ Base = create(isl_ast_expr_get_op_arg(Expr, 0));
assert(Base->getType()->isPointerTy() && "Access base should be a pointer");
- Value *Index = create(isl_ast_expr_get_op_arg(Expr, 1));
- assert(Index->getType()->isIntegerTy() &&
+ IndexOp = create(isl_ast_expr_get_op_arg(Expr, 1));
+ assert(IndexOp->getType()->isIntegerTy() &&
"Access index should be an integer");
+ Zero = ConstantInt::getNullValue(IndexOp->getType());
+
+ // If base is a array type like,
+ // int A[N][M][K];
+ // we have to adjust the GEP. The easiest way is to transform accesses like,
+ // A[i][j][k]
+ // into equivalent ones like,
+ // A[0][0][ i*N*M + j*M + k]
+ // because SCEV already folded the "peudo dimensions" into one. Thus our index
+ // operand will be 'i*N*M + j*M + k' anyway.
+ PtrElTy = Base->getType()->getPointerElementType();
+ while (PtrElTy->isArrayTy()) {
+ Indices.push_back(Zero);
+ PtrElTy = PtrElTy->getArrayElementType();
+ }
- // TODO: Change the type of base before we create the GEP.
- Type *PtrElTy = Base->getType()->getPointerElementType();
+ Indices.push_back(IndexOp);
assert((PtrElTy->isIntOrIntVectorTy() || PtrElTy->isFPOrFPVectorTy()) &&
"We do not yet change the type of the access base during code "
"generation.");
- Twine Name = "polly.access." + Base->getName();
- Value *Access = Builder.CreateGEP(Base, Index, Name);
+ Access = Builder.CreateGEP(Base, Indices, "polly.access." + Base->getName());
isl_ast_expr_free(Expr);
return Access;
Modified: polly/trunk/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll?rev=214659&r1=214658&r2=214659&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll (original)
+++ polly/trunk/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll Sat Aug 2 20:51:59 2014
@@ -1,5 +1,7 @@
;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withconst -polly-codegen-isl < %s -S | FileCheck -check-prefix=WITHCONST %s
;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withoutconst -polly-codegen-isl < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withconst -polly-codegen-isl -polly-codegen-scev < %s -S | FileCheck -check-prefix=WITHCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withoutconst -polly-codegen-isl -polly-codegen-scev < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
;int A[1040];
;
@@ -55,20 +57,19 @@ for.end6:
ret i32 0
}
-; WITHCONST: [[REG1:%[0-9]+]] = sext i32 %{{[0-9]+}} to i64
-; WITHCONST: %p_mul_coeff = mul i64 16, [[REG1]]
-; WITHCONST: %p_sum_coeff = add i64 5, %p_mul_coeff
-; WITHCONST: [[REG2:%[0-9]+]] = sext i32 %{{[0-9]+}} to i64
-; WITHCONST: %p_mul_coeff8 = mul i64 2, [[REG2]]
-; WITHCONST: %p_sum_coeff9 = add i64 %p_sum_coeff, %p_mul_coeff8
-; WITHCONST: %p_newarrayidx_ = getelementptr [1040 x i32]* @A, i64 0, i64 %p_sum_coeff9
-; WITHCONST: store i32 100, i32* %p_newarrayidx_
-
-; WITHOUTCONST: [[REG1:%[0-9]+]] = sext i32 %{{[0-9]+}} to i64
-; WITHOUTCONST: %p_mul_coeff = mul i64 16, [[REG1]]
-; WITHOUTCONST: %p_sum_coeff = add i64 0, %p_mul_coeff
-; WITHOUTCONST: [[REG2:%[0-9]+]] = sext i32 %{{[0-9]+}} to i64
-; WITHOUTCONST: %p_mul_coeff8 = mul i64 2, [[REG2]]
-; WITHOUTCONST: %p_sum_coeff9 = add i64 %p_sum_coeff, %p_mul_coeff8
-; WITHOUTCONST: %p_newarrayidx_ = getelementptr [1040 x i32]* @A, i64 0, i64 %p_sum_coeff9
-; WITHOUTCONST: store i32 100, i32* %p_newarrayidx_
+; WITHCONST: %[[IVOut:polly.indvar[0-9]*]] = phi i64 [ 0, %polly.loop_preheader{{[0-9]*}} ], [ %polly.indvar_next{{[0-9]*}}, %polly.{{[._a-zA-Z0-9]*}} ]
+; WITHCONST: %[[IVIn:polly.indvar[0-9]*]] = phi i64 [ 0, %polly.loop_preheader{{[0-9]*}} ], [ %polly.indvar_next{{[0-9]*}}, %polly.{{[._a-zA-Z0-9]*}} ]
+; WITHCONST: %[[MUL1:[._a-zA-Z0-9]+]] = mul nsw i64 16, %[[IVOut]]
+; WITHCONST: %[[MUL2:[._a-zA-Z0-9]+]] = mul nsw i64 2, %[[IVIn]]
+; WITHCONST: %[[SUM1:[._a-zA-Z0-9]+]] = add nsw i64 %[[MUL1]], %[[MUL2]]
+; WITHCONST: %[[SUM2:[._a-zA-Z0-9]+]] = add nsw i64 %[[SUM1]], 5
+; WITHCONST: %[[ACC:[._a-zA-Z0-9]*]] = getelementptr [1040 x i32]* @A, i64 0, i64 %[[SUM2]]
+; WITHCONST: store i32 100, i32* %[[ACC]]
+
+; WITHOUTCONST: %[[IVOut:polly.indvar[0-9]*]] = phi i64 [ 0, %polly.loop_preheader{{[0-9]*}} ], [ %polly.indvar_next{{[0-9]*}}, %polly.{{[._a-zA-Z0-9]*}} ]
+; WITHOUTCONST: %[[IVIn:polly.indvar[0-9]*]] = phi i64 [ 0, %polly.loop_preheader{{[0-9]*}} ], [ %polly.indvar_next{{[0-9]*}}, %polly.{{[._a-zA-Z0-9]*}} ]
+; WITHOUTCONST: %[[MUL1:[._a-zA-Z0-9]+]] = mul nsw i64 16, %[[IVOut]]
+; WITHOUTCONST: %[[MUL2:[._a-zA-Z0-9]+]] = mul nsw i64 2, %[[IVIn]]
+; WITHOUTCONST: %[[SUM1:[._a-zA-Z0-9]+]] = add nsw i64 %[[MUL1]], %[[MUL2]]
+; WITHOUTCONST: %[[ACC:[._a-zA-Z0-9]*]] = getelementptr [1040 x i32]* @A, i64 0, i64 %[[SUM1]]
+; WITHOUTCONST: store i32 100, i32* %[[ACC]]
More information about the llvm-commits
mailing list