<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 10, 2017 at 9:23 PM, Tobias Grosser via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: grosser<br>
Date: Mon Apr 10 23:23:38 2017<br>
New Revision: 299913<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=299913&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=299913&view=rev</a><br>
Log:<br>
SAdjust to recent change in constructor definition of AllocaInst<br>
<br>
Modified:<br>
polly/trunk/lib/CodeGen/<wbr>BlockGenerators.cpp<br>
polly/trunk/lib/CodeGen/<wbr>LoopGenerators.cpp<br>
polly/trunk/lib/CodeGen/<wbr>PPCGCodeGeneration.cpp<br>
<br>
Modified: polly/trunk/lib/CodeGen/<wbr>BlockGenerators.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=299913&r1=299912&r2=299913&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/polly/trunk/lib/<wbr>CodeGen/BlockGenerators.cpp?<wbr>rev=299913&r1=299912&r2=<wbr>299913&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- polly/trunk/lib/CodeGen/<wbr>BlockGenerators.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/<wbr>BlockGenerators.cpp Mon Apr 10 23:23:38 2017<br>
@@ -408,8 +408,8 @@ Value *BlockGenerator::<wbr>getOrCreateAlloca<br>
else<br>
NameExt = ".s2a";<br>
<br>
- const DataLayout &DL<br>
- = Builder.GetInsertBlock()-><wbr>getParent()->getParent()-><wbr>getDataLayout();<br>
+ const DataLayout &DL =<br>
+ Builder.GetInsertBlock()-><wbr>getParent()->getParent()-><wbr>getDataLayout();<br></blockquote><div>I remember in the newest LLVM, BasicBlock has a function "getModule" which directly return the module</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Addr = new AllocaInst(Ty, DL.getAllocaAddrSpace(),<br>
ScalarBase->getName() + NameExt);<br>
<br>
Modified: polly/trunk/lib/CodeGen/<wbr>LoopGenerators.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=299913&r1=299912&r2=299913&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/polly/trunk/lib/<wbr>CodeGen/LoopGenerators.cpp?<wbr>rev=299913&r1=299912&r2=<wbr>299913&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- polly/trunk/lib/CodeGen/<wbr>LoopGenerators.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/<wbr>LoopGenerators.cpp Mon Apr 10 23:23:38 2017<br>
@@ -281,8 +281,8 @@ ParallelLoopGenerator::<wbr>storeValuesIntoSt<br>
for (Value *V : Values)<br>
Members.push_back(V->getType()<wbr>);<br>
<br>
- const DataLayout &DL<br>
- = Builder.GetInsertBlock()-><wbr>getParent()->getParent()-><wbr>getDataLayout();<br>
+ const DataLayout &DL =<br>
+ Builder.GetInsertBlock()-><wbr>getParent()->getParent()-><wbr>getDataLayout();<br>
<br>
// We do not want to allocate the alloca inside any loop, thus we allocate it<br>
// in the entry block of the function and use annotations to denote the actual<br>
<br>
Modified: polly/trunk/lib/CodeGen/<wbr>PPCGCodeGeneration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp?rev=299913&r1=299912&r2=299913&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/polly/trunk/lib/<wbr>CodeGen/PPCGCodeGeneration.<wbr>cpp?rev=299913&r1=299912&r2=<wbr>299913&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- polly/trunk/lib/CodeGen/<wbr>PPCGCodeGeneration.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/<wbr>PPCGCodeGeneration.cpp Mon Apr 10 23:23:38 2017<br>
@@ -1083,9 +1083,10 @@ GPUNodeBuilder::<wbr>createLaunchParameters(p<br>
<br>
BasicBlock *EntryBlock =<br>
&Builder.GetInsertBlock()-><wbr>getParent()->getEntryBlock();<br>
+ auto AddressSpace = F->getParent()->getDataLayout(<wbr>).getAllocaAddrSpace();<br>
std::string Launch = "polly_launch_" + std::to_string(Kernel->id);<br>
- Instruction *Parameters =<br>
- new AllocaInst(ArrayTy, Launch + "_params", EntryBlock->getTerminator());<br>
+ Instruction *Parameters = new AllocaInst(<br>
+ ArrayTy, AddressSpace, Launch + "_params", EntryBlock->getTerminator());<br>
<br>
int Index = 0;<br>
for (long i = 0; i < Prog->n_array; i++) {<br>
@@ -1115,9 +1116,10 @@ GPUNodeBuilder::<wbr>createLaunchParameters(p<br>
Builder.CreatePointerCast(<wbr>ValPtr, Builder.getInt8PtrTy());<br>
Builder.CreateStore(<wbr>ValPtrCast, Slot);<br>
} else {<br>
- Instruction *Param = new AllocaInst(<br>
- Builder.getInt8PtrTy(), Launch + "_param_" + std::to_string(Index),<br>
- EntryBlock->getTerminator());<br>
+ Instruction *Param =<br>
+ new AllocaInst(Builder.<wbr>getInt8PtrTy(), AddressSpace,<br>
+ Launch + "_param_" + std::to_string(Index),<br>
+ EntryBlock->getTerminator());<br>
Builder.CreateStore(DevArray, Param);<br>
Value *ParamTyped =<br>
Builder.CreatePointerCast(<wbr>Param, Builder.getInt8PtrTy());<br>
@@ -1132,9 +1134,10 @@ GPUNodeBuilder::<wbr>createLaunchParameters(p<br>
isl_id *Id = isl_space_get_dim_id(Kernel-><wbr>space, isl_dim_set, i);<br>
Value *Val = IDToValue[Id];<br>
isl_id_free(Id);<br>
- Instruction *Param = new AllocaInst(<br>
- Val->getType(), Launch + "_param_" + std::to_string(Index),<br>
- EntryBlock->getTerminator());<br>
+ Instruction *Param =<br>
+ new AllocaInst(Val->getType(), AddressSpace,<br>
+ Launch + "_param_" + std::to_string(Index),<br>
+ EntryBlock->getTerminator());<br>
Builder.CreateStore(Val, Param);<br>
Value *Slot = Builder.CreateGEP(<br>
Parameters, {Builder.getInt64(0), Builder.getInt64(Index)});<br>
@@ -1150,9 +1153,10 @@ GPUNodeBuilder::<wbr>createLaunchParameters(p<br>
isl_id *Id = isl_space_get_dim_id(Kernel-><wbr>space, isl_dim_param, i);<br>
Value *Val = IDToValue[Id];<br>
isl_id_free(Id);<br>
- Instruction *Param = new AllocaInst(<br>
- Val->getType(), Launch + "_param_" + std::to_string(Index),<br>
- EntryBlock->getTerminator());<br>
+ Instruction *Param =<br>
+ new AllocaInst(Val->getType(), AddressSpace,<br>
+ Launch + "_param_" + std::to_string(Index),<br>
+ EntryBlock->getTerminator());<br>
Builder.CreateStore(Val, Param);<br>
Value *Slot = Builder.CreateGEP(<br>
Parameters, {Builder.getInt64(0), Builder.getInt64(Index)});<br>
@@ -1163,9 +1167,10 @@ GPUNodeBuilder::<wbr>createLaunchParameters(p<br>
}<br>
<br>
for (auto Val : SubtreeValues) {<br>
- Instruction *Param = new AllocaInst(<br>
- Val->getType(), Launch + "_param_" + std::to_string(Index),<br>
- EntryBlock->getTerminator());<br>
+ Instruction *Param =<br>
+ new AllocaInst(Val->getType(), AddressSpace,<br>
+ Launch + "_param_" + std::to_string(Index),<br>
+ EntryBlock->getTerminator());<br>
Builder.CreateStore(Val, Param);<br>
Value *Slot = Builder.CreateGEP(<br>
Parameters, {Builder.getInt64(0), Builder.getInt64(Index)});<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>