Skip to content

Commit 67351f4

Browse files
lwesierslwesiers
committed
Synchronisation between branches.
Change-Id: Iae7a99f21fe8a01cb794d634d961d14f58bab60d
1 parent a02a00f commit 67351f4

File tree

240 files changed

+146543
-145028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+146543
-145028
lines changed

‎IGC/AdaptorCommon/AddImplicitArgs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3535
#include "common/LLVMWarningsPush.hpp"
3636
#include "llvm/ADT/SCCIterator.h"
3737
#include <llvm/IR/Module.h>
38-
#include <llvmWrapper/IR/Function.h>
38+
#include <llvmWrapper/IR/Function.h>
3939
#include <llvm/IR/Instructions.h>
4040
#include <llvm/IR/DerivedTypes.h>
4141
#include "llvm/IR/DIBuilder.h"
@@ -356,7 +356,7 @@ void AddImplicitArgs::replaceAllUsesWithNewOCLBuiltinFunction(CodeGenContext* ct
356356
llvm::Function::arg_iterator new_arg_iter = new_func->arg_begin();
357357
llvm::Function::arg_iterator new_arg_end = new_func->arg_end();
358358

359-
assert(IGCLLVM::GetFuncArgSize(new_func) >= numArgOperands);
359+
assert(IGCLLVM::GetFuncArgSize(new_func) >= numArgOperands);
360360

361361
// basic arguments
362362
for (unsigned int i = 0; i < numArgOperands; ++i, ++new_arg_iter)

‎IGC/AdaptorCommon/IRUpgrader/IRUpgrader.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ namespace IGC
3737
/// Transform legacy resource access intrinsics taking an integer representation to
3838
/// the new intrinsics taking pointer representation
3939
llvm::Pass* CreateUpgradeResourceIntrinsic();
40-
///Transfor legacy gen intrisics with prefix "@genx." => "@llvm.genx."
41-
llvm::Pass* CreateUpgradeGenIntrinsicPrefix();
40+
///Transfor legacy gen intrisics with prefix "@genx." => "@llvm.genx."
41+
llvm::Pass* CreateUpgradeGenIntrinsicPrefix();
4242
}

‎IGC/AdaptorCommon/IRUpgrader/UpgraderResourceAccess.cpp

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ void UpgradeResourceAccess::ChangeIntrinsic(CallInst& C, GenISAIntrinsic::ID ID)
150150
types.push_back(args[resIndex]->getType());
151151
}
152152
break;
153-
case GenISAIntrinsic::GenISA_ldmcsptr: {
154-
types.push_back(C.getType());
155-
types.push_back(C.getArgOperand(0)->getType());
156-
unsigned int resIndex = C.getNumOperands() - 5;
157-
args[resIndex] = GetResource(m, builder, args[resIndex]);
158-
types.push_back(args[resIndex]->getType());
159-
}
160-
break;
153+
case GenISAIntrinsic::GenISA_ldmcsptr: {
154+
types.push_back(C.getType());
155+
types.push_back(C.getArgOperand(0)->getType());
156+
unsigned int resIndex = C.getNumOperands() - 5;
157+
args[resIndex] = GetResource(m, builder, args[resIndex]);
158+
types.push_back(args[resIndex]->getType());
159+
}
160+
break;
161161
default:
162162
assert("unhandled intrinsic upgrade" && 0);
163163
break;
@@ -175,47 +175,47 @@ void UpgradeResourceAccess::visitCallInst(CallInst& C)
175175
{
176176
return;
177177
}
178-
179-
//Note : This upgrader pass is handling legacy intrinsics as well,
180-
// hence we might be dealing with intrinsics starting with @genx.
181-
if(C.getCalledFunction()->getName().contains("genx.GenISA.sample."))
178+
179+
//Note : This upgrader pass is handling legacy intrinsics as well,
180+
// hence we might be dealing with intrinsics starting with @genx.
181+
if(C.getCalledFunction()->getName().contains("genx.GenISA.sample."))
182182
{
183183
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleptr);
184184
}
185-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleB."))
185+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleB."))
186186
{
187187
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleBptr);
188188
}
189-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleD."))
189+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleD."))
190190
{
191191
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleDptr);
192192
}
193-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleC."))
193+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleC."))
194194
{
195195
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleCptr);
196196
}
197-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleL."))
197+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleL."))
198198
{
199199
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleLptr);
200200
}
201-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.gather4."))
201+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.gather4."))
202202
{
203203
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_gather4ptr);
204204
}
205-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.ldms."))
205+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.ldms."))
206206
{
207207
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_ldmsptr);
208208
}
209-
else if(C.getCalledFunction()->getName().equals("llvm.genx.GenISA.ldmcs") ||
210-
C.getCalledFunction()->getName().equals("genx.GenISA.ldmcs"))
209+
else if(C.getCalledFunction()->getName().equals("llvm.genx.GenISA.ldmcs") ||
210+
C.getCalledFunction()->getName().equals("genx.GenISA.ldmcs"))
211211
{
212212
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_ldmcsptr);
213213
}
214-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.ld."))
214+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.ld."))
215215
{
216216
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_ldptr);
217217
}
218-
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleKill.legacy"))
218+
else if(C.getCalledFunction()->getName().contains("genx.GenISA.sampleKill.legacy"))
219219
{
220220
ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleKillPix);
221221
}
@@ -228,52 +228,52 @@ void UpgradeResourceAccess::visitCallInst(CallInst& C)
228228
}
229229
}
230230

231-
class UpgradeGenIntrinsicPrefix : public ModulePass, public InstVisitor<UpgradeGenIntrinsicPrefix>
232-
{
233-
public:
234-
UpgradeGenIntrinsicPrefix() : ModulePass(ID) {}
235-
236-
static char ID;
237-
void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
238-
{
239-
AU.setPreservesCFG();
240-
}
241-
//bool runOnFunction(llvm::Function &F) override;
242-
bool runOnModule(llvm::Module &M) override;
243-
244-
llvm::StringRef getPassName() const override
245-
{
246-
return "UpgradeGenIntrinsicPrefix";
247-
}
248-
249-
private:
250-
bool m_changed = false;
251-
};
252-
char UpgradeGenIntrinsicPrefix::ID = 0;
253-
254-
bool UpgradeGenIntrinsicPrefix::runOnModule(llvm::Module &M)
255-
{
256-
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
257-
Function* pFunc = &(*I);
258-
if (pFunc->getName().startswith("genx."))
259-
pFunc->setName("llvm." + pFunc->getName());
260-
}
261-
262-
return m_changed;
263-
}
264-
231+
class UpgradeGenIntrinsicPrefix : public ModulePass, public InstVisitor<UpgradeGenIntrinsicPrefix>
232+
{
233+
public:
234+
UpgradeGenIntrinsicPrefix() : ModulePass(ID) {}
235+
236+
static char ID;
237+
void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
238+
{
239+
AU.setPreservesCFG();
240+
}
241+
//bool runOnFunction(llvm::Function &F) override;
242+
bool runOnModule(llvm::Module &M) override;
243+
244+
llvm::StringRef getPassName() const override
245+
{
246+
return "UpgradeGenIntrinsicPrefix";
247+
}
248+
249+
private:
250+
bool m_changed = false;
251+
};
252+
char UpgradeGenIntrinsicPrefix::ID = 0;
253+
254+
bool UpgradeGenIntrinsicPrefix::runOnModule(llvm::Module &M)
255+
{
256+
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
257+
Function* pFunc = &(*I);
258+
if (pFunc->getName().startswith("genx."))
259+
pFunc->setName("llvm." + pFunc->getName());
260+
}
261+
262+
return m_changed;
263+
}
264+
265265

266266
namespace IGC
267267
{
268268
Pass* CreateUpgradeResourceIntrinsic()
269269
{
270270
return new UpgradeResourceAccess();
271271
}
272-
273-
Pass* CreateUpgradeGenIntrinsicPrefix()
274-
{
275-
return new UpgradeGenIntrinsicPrefix();
276-
}
277-
278-
279-
}
272+
273+
Pass* CreateUpgradeGenIntrinsicPrefix()
274+
{
275+
return new UpgradeGenIntrinsicPrefix();
276+
}
277+
278+
279+
}

‎IGC/AdaptorCommon/ImplicitArgs.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2929

3030
#include "common/LLVMWarningsPush.hpp"
3131
#include <llvm/IR/DerivedTypes.h>
32-
#include <llvmWrapper/IR/Function.h>
32+
#include <llvmWrapper/IR/Function.h>
3333
#include <llvm/IR/Metadata.h>
3434
#include <llvm/IR/Module.h>
3535
#include "common/LLVMWarningsPop.hpp"
@@ -389,7 +389,7 @@ void ImplicitArgs::addBufferOffsetArgs(llvm::Function& F, IGCMD::MetaDataUtils*
389389
ImplicitArg::ArgMap OffsetArgs;
390390
FunctionInfoMetaDataHandle funcInfoMD =
391391
pMdUtils->getFunctionsInfoItem(const_cast<Function*>(&F));
392-
for (auto& Arg : F.args() )
392+
for (auto& Arg : F.args() )
393393
{
394394
Value* AV = &Arg;
395395
PointerType* PTy = dyn_cast<PointerType>(AV->getType());
@@ -465,10 +465,10 @@ int32_t ImplicitArgs::getStructArgOffset(unsigned int index) const
465465

466466
TODO("Refactor code to avoid code triplication for getArgInFunc(), getImplicitArg() and WIFuncResolution::getImplicitArg()")
467467
Argument* ImplicitArgs::getArgInFunc(llvm::Function& F, ImplicitArg::ArgType argType) {
468-
assert(IGCLLVM::GetFuncArgSize(F) >= size() && "Invalid number of argumnents in the function!");
468+
assert(IGCLLVM::GetFuncArgSize(F) >= size() && "Invalid number of argumnents in the function!");
469469

470470
unsigned int argIndex = getArgIndex(argType);
471-
unsigned int argIndexInFunc = IGCLLVM::GetFuncArgSize(F) - size() + argIndex;
471+
unsigned int argIndexInFunc = IGCLLVM::GetFuncArgSize(F) - size() + argIndex;
472472
Function::arg_iterator arg = F.arg_begin();
473473
for (unsigned int i = 0; i < argIndexInFunc; ++i, ++arg);
474474

@@ -482,7 +482,7 @@ Argument* ImplicitArgs::getImplicitArg(llvm::Function& F, ImplicitArg::ArgType a
482482
return nullptr;
483483
unsigned int implicitArgIndex = this->getArgIndex(argType);
484484

485-
unsigned int implicitArgIndexInFunc = IGCLLVM::GetFuncArgSize(F) - numImplicitArgs + implicitArgIndex;
485+
unsigned int implicitArgIndexInFunc = IGCLLVM::GetFuncArgSize(F) - numImplicitArgs + implicitArgIndex;
486486

487487
Function::arg_iterator arg = F.arg_begin();
488488
for (unsigned int i = 0; i < implicitArgIndexInFunc; ++i, ++arg);
@@ -492,14 +492,14 @@ Argument* ImplicitArgs::getImplicitArg(llvm::Function& F, ImplicitArg::ArgType a
492492

493493
Argument* ImplicitArgs::getNumberedImplicitArg(llvm::Function& F, ImplicitArg::ArgType argType, int argNum)
494494
{
495-
assert(IGCLLVM::GetFuncArgSize(F) >= size() && "Invalid number of arguments in the function!");
495+
assert(IGCLLVM::GetFuncArgSize(F) >= size() && "Invalid number of arguments in the function!");
496496

497497
unsigned int numImplicitArgs = size();
498498
unsigned int implicitArgIndex = this->getNumberedArgIndex(argType, argNum);
499499
if (implicitArgIndex == numImplicitArgs)
500500
return nullptr;
501501

502-
unsigned int implicitArgIndexInFunc = IGCLLVM::GetFuncArgSize(F) - numImplicitArgs + implicitArgIndex;
502+
unsigned int implicitArgIndexInFunc = IGCLLVM::GetFuncArgSize(F) - numImplicitArgs + implicitArgIndex;
503503

504504
Function::arg_iterator arg = F.arg_begin();
505505
for (unsigned int i = 0; i < implicitArgIndexInFunc; ++i, ++arg);

‎IGC/AdaptorCommon/ProcessFuncAttributes.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3434
#include "SPIRV/SPIRVInternal.h"
3535

3636
#include "common/LLVMWarningsPush.hpp"
37-
38-
#include "llvmWrapper/IR/Attributes.h"
39-
37+
38+
#include "llvmWrapper/IR/Attributes.h"
39+
4040
#include <llvm/Pass.h>
4141
#include <llvm/IR/Module.h>
4242
#include <llvm/IR/Function.h>
@@ -236,7 +236,7 @@ bool ProcessFuncAttributes::runOnModule(Module& M)
236236
for (auto I : F->users()) {
237237
if (CallInst* callInst = dyn_cast<CallInst>(&*I)) {
238238
if (callInst->hasFnAttr(llvm::Attribute::NoInline)) {
239-
callInst->removeAttribute(IGCLLVM::AttributeSet::FunctionIndex, llvm::Attribute::NoInline);
239+
callInst->removeAttribute(IGCLLVM::AttributeSet::FunctionIndex, llvm::Attribute::NoInline);
240240
}
241241
}
242242
}
@@ -296,7 +296,7 @@ bool ProcessFuncAttributes::runOnModule(Module& M)
296296

297297
if (!keepAlwaysInline)
298298
{
299-
for (auto &arg : F->args())
299+
for (auto &arg : F->args())
300300
{
301301
// If argument contains an opaque type e.g. image, then always inline it.
302302
// If argument is a pointer to GAS, always inline it for perf reason.

‎IGC/AdaptorCommon/TypesLegalizationPass.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -241,23 +241,23 @@ TypesLegalizationPass::ResolveValue( Instruction *ip,Value *val,SmallVector<unsi
241241
break;
242242
}
243243
}
244-
else if ((isa<Argument>(val) || isa<CallInst>(val)) &&
245-
val->getType()->isStructTy()) {
246-
// Handle struct arguments and structs returned by function calls.
247-
IRBuilder<> builder(ip);
248-
return builder.CreateExtractValue(val, indices);
249-
}
250-
else if (PHINode* phi = dyn_cast<PHINode>(val))
251-
{
252-
IRBuilder<> builder(&(*ip->getParent()->getFirstInsertionPt()));
253-
PHINode* newPhi = builder.CreatePHI(ip->getType(), phi->getNumIncomingValues());
254-
for (unsigned i = 0; i < phi->getNumIncomingValues(); i++)
255-
{
256-
Value* v = ResolveValue(ip, phi->getIncomingValue(i), indices);
257-
newPhi->addIncoming(v, phi->getIncomingBlock(i));
258-
}
259-
return newPhi;
260-
}
244+
else if ((isa<Argument>(val) || isa<CallInst>(val)) &&
245+
val->getType()->isStructTy()) {
246+
// Handle struct arguments and structs returned by function calls.
247+
IRBuilder<> builder(ip);
248+
return builder.CreateExtractValue(val, indices);
249+
}
250+
else if (PHINode* phi = dyn_cast<PHINode>(val))
251+
{
252+
IRBuilder<> builder(&(*ip->getParent()->getFirstInsertionPt()));
253+
PHINode* newPhi = builder.CreatePHI(ip->getType(), phi->getNumIncomingValues());
254+
for (unsigned i = 0; i < phi->getNumIncomingValues(); i++)
255+
{
256+
Value* v = ResolveValue(ip, phi->getIncomingValue(i), indices);
257+
newPhi->addIncoming(v, phi->getIncomingBlock(i));
258+
}
259+
return newPhi;
260+
}
261261

262262
// What other kind of instruction can we have here?
263263
assert( !"Unresolved instruction!" );

0 commit comments

Comments
 (0)