Skip to content

Commit 78c2ad9

Browse files
dlei6gZuul
authored and
Zuul
committed
Moved global address flag from OCL internal options to options.
Renamed option to "-cl-take-global-address" from "-cl-intel-enable-global-relocation". Change-Id: Iafceb9af49104bd96216da039de47f3f9dbb17af
1 parent 582915e commit 78c2ad9

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

IGC/AdaptorOCL/UnifyIROCL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static void CommonOCLBasedPasses(
254254
}
255255

256256
CompilerOpts.EnableTakeGlobalAddress =
257-
pContext->m_InternalOptions.EnableTakeGlobalAddress;
257+
pContext->m_Options.EnableTakeGlobalAddress;
258258

259259
// right now we don't support any standard function in the code gen
260260
// maybe we want to support some at some point to take advantage of LLVM optimizations

IGC/Compiler/CodeGenPublic.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1070,10 +1070,6 @@ namespace IGC
10701070
{
10711071
PreferBindlessImages = true;
10721072
}
1073-
if (strstr(options, "-cl-intel-enable-global-relocation"))
1074-
{
1075-
EnableTakeGlobalAddress = true;
1076-
}
10771073
if (strstr(options, "-cl-intel-force-global-mem-allocation"))
10781074
{
10791075
IntelForceGlobalMemoryAllocation = true;
@@ -1093,7 +1089,6 @@ namespace IGC
10931089
bool IntelEnablePreRAScheduling = true;
10941090
bool PromoteStatelessToBindless = false;
10951091
bool PreferBindlessImages = false;
1096-
bool EnableTakeGlobalAddress = false;
10971092
bool IntelForceGlobalMemoryAllocation = false;
10981093

10991094
};
@@ -1130,11 +1125,16 @@ namespace IGC
11301125
// the module metadata.
11311126
UniformWGS = true;
11321127
}
1128+
if (strstr(options, "-cl-take-global-address"))
1129+
{
1130+
EnableTakeGlobalAddress = true;
1131+
}
11331132
}
11341133

11351134
bool CorrectlyRoundedSqrt;
11361135
bool NoSubgroupIFP;
11371136
bool UniformWGS;
1137+
bool EnableTakeGlobalAddress = false;
11381138
};
11391139

11401140
// output: shader information

0 commit comments

Comments
 (0)