Skip to content

Commit 54cee5d

Browse files
karolmikolajczukigcbot
authored andcommitted
Revert of Mark loads/stores for private variables
Revert of Mark loads/stores which are created for fill/spill of user private variables. In llvm-IR load/stores it has mark "user_addrspace_priv". In asm dumps it has mark "address space: private;"
1 parent 4a2d30b commit 54cee5d

File tree

6 files changed

+48
-214
lines changed

6 files changed

+48
-214
lines changed

IGC/Compiler/CISACodeGen/CISABuilder.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8142,8 +8142,7 @@ namespace IGC
81428142
LSC_ADDR_SIZE addr_size,
81438143
LSC_DATA_ORDER data_order,
81448144
int immOffset,
8145-
LSC_CACHE_OPTS cacheOpts,
8146-
LSC_DOC_ADDR_SPACE addrSpace)
8145+
LSC_CACHE_OPTS cacheOpts)
81478146
{
81488147
LSC_SFID lscSfid =
81498148
resource && resource->m_surfaceType == ESURFACE_SLM ?
@@ -8157,7 +8156,8 @@ namespace IGC
81578156
addr.immScale = 1;
81588157
addr.immOffset = immOffset;
81598158
addr.size = addr_size;
8160-
addr.addrSpace = addrSpace;
8159+
// TODO: update this accordingly
8160+
addr.addrSpace = LSC_DOC_ADDR_SPACE::INVALID;
81618161

81628162
if (resource)
81638163
{
@@ -8292,8 +8292,7 @@ namespace IGC
82928292
LSC_ADDR_SIZE addr_size,
82938293
LSC_DATA_ORDER data_order,
82948294
int immOffset,
8295-
LSC_CACHE_OPTS cacheOpts,
8296-
LSC_DOC_ADDR_SPACE addrSpace)
8295+
LSC_CACHE_OPTS cacheOpts)
82978296
{
82988297
LSC_SFID lscSfid =
82998298
resource && resource->m_surfaceType == ESURFACE_SLM ?
@@ -8308,8 +8307,7 @@ namespace IGC
83088307
addr.immScale = 1;
83098308
addr.immOffset = immOffset;
83108309
addr.size = addr_size;
8311-
addr.addrSpace = addrSpace;
8312-
8310+
addr.addrSpace = LSC_DOC_ADDR_SPACE::INVALID;
83138311
if (resource)
83148312
{
83158313
addr.type = getLSCAddrType(resource);

IGC/Compiler/CISACodeGen/CISABuilder.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,15 @@ namespace IGC
260260
LSC_DATA_ELEMS numElems, unsigned blockOffset,
261261
ResourceDescriptor *resource,
262262
LSC_ADDR_SIZE addr_size, LSC_DATA_ORDER data_order,
263-
int immOffset, LSC_CACHE_OPTS cacheOpts,
264-
LSC_DOC_ADDR_SPACE addrSpace);
263+
int immOffset, LSC_CACHE_OPTS cacheOpts);
265264
void LSC_StoreScatter(LSC_OP subOp,
266265
CVariable *src, CVariable *offset,
267266
LSC_DATA_SIZE elemSize, LSC_DATA_ELEMS numElems,
268267
unsigned blockOffset,
269268
ResourceDescriptor *resource,
270269
LSC_ADDR_SIZE addr_size,
271270
LSC_DATA_ORDER data_order, int immOffset,
272-
LSC_CACHE_OPTS cacheOpts,
273-
LSC_DOC_ADDR_SPACE addrSpace);
271+
LSC_CACHE_OPTS cacheOpts);
274272
void LSC_LoadBlock1D(
275273
CVariable* dst, CVariable* offset,
276274
LSC_DATA_SIZE elemSize, LSC_DATA_ELEMS numElems,

0 commit comments

Comments
 (0)