Do not mergeload if extractelement index is not constant

Jay-Jiewu-Lu · sys_zuul · commit 7fd15c01c5de · 2019-12-03T15:20:44.000-08:00
Change-Id: I9baf8bb51af81aa900c674a792a1cba337751fb7
diff --git a/IGC/Compiler/CISACodeGen/ConstantCoalescing.cpp b/IGC/Compiler/CISACodeGen/ConstantCoalescing.cpp
@@ -835,10 +835,6 @@ void ConstantCoalescing::MergeScatterLoad(Instruction* load,
         if (start_adj == 0 && size_adj == 0)
         {
             splitter = FindOrAddChunkExtract(cov_chunk, eltid);
-            if (!splitter)
-            {
-                return;
-            }
         }
         else if (start_adj > 0)
         {
@@ -1132,10 +1128,6 @@ void ConstantCoalescing::MergeUniformLoad(Instruction* load,
         if (start_adj == 0 && size_adj == 0)
         {
             splitter = FindOrAddChunkExtract(cov_chunk, eltid);
-            if (!splitter)
-            {
-                return;
-            }
         }
         else if (start_adj > 0)
         {
@@ -1508,8 +1500,8 @@ Instruction* ConstantCoalescing::FindOrAddChunkExtract(BufChunk* cov_chunk, uint
         assert(usei && isa<ExtractElementInst>(usei));
         ConstantInt* e_idx = dyn_cast<ConstantInt>(usei->getOperand(1));
         if (!e_idx)
-        {   //todo: temp fix, enhance later
-            return nullptr;
+        {
+            continue;
         }
         assert(e_idx);
         uint val = (uint)e_idx->getZExtValue();

Original file line number	Diff line number	Diff line change
`@@ -835,10 +835,6 @@ void ConstantCoalescing::MergeScatterLoad(Instruction* load,`
`835`	`835`	`if (start_adj == 0 && size_adj == 0)`
`836`	`836`	`{`
`837`	`837`	`splitter = FindOrAddChunkExtract(cov_chunk, eltid);`
`838`		`- if (!splitter)`
`839`		`- {`
`840`		`- return;`
`841`		`- }`
`842`	`838`	`}`
`843`	`839`	`else if (start_adj > 0)`
`844`	`840`	`{`
`@@ -1132,10 +1128,6 @@ void ConstantCoalescing::MergeUniformLoad(Instruction* load,`
`1132`	`1128`	`if (start_adj == 0 && size_adj == 0)`
`1133`	`1129`	`{`
`1134`	`1130`	`splitter = FindOrAddChunkExtract(cov_chunk, eltid);`
`1135`		`- if (!splitter)`
`1136`		`- {`
`1137`		`- return;`
`1138`		`- }`
`1139`	`1131`	`}`
`1140`	`1132`	`else if (start_adj > 0)`
`1141`	`1133`	`{`
`@@ -1508,8 +1500,8 @@ Instruction* ConstantCoalescing::FindOrAddChunkExtract(BufChunk* cov_chunk, uint`
`1508`	`1500`	`assert(usei && isa<ExtractElementInst>(usei));`
`1509`	`1501`	`ConstantInt* e_idx = dyn_cast<ConstantInt>(usei->getOperand(1));`
`1510`	`1502`	`if (!e_idx)`
`1511`		`- { //todo: temp fix, enhance later`
`1512`		`- return nullptr;`
	`1503`	`+ {`
	`1504`	`+ continue;`
`1513`	`1505`	`}`
`1514`	`1506`	`assert(e_idx);`
`1515`	`1507`	`uint val = (uint)e_idx->getZExtValue();`