When stack is used, make sure the spill/fill temp is at least one GRF.

weiyu-chen · sys_zuul · commit 731f79b7ae59 · 2020-05-29T11:22:03.000-07:00
Change-Id: I255fd08b21b8ceec1e6c7a20242ed5d79ccd6f8c
diff --git a/visa/SpillManagerGMRF.cpp b/visa/SpillManagerGMRF.cpp
@@ -1245,11 +1245,13 @@ SpillManagerGRF::createTransientGRFRangeDeclare (
         height = 1;
     }
 
-    if( useScratchMsg_ )
+    bool usesStack = builder_->kernel.fg.getIsStackCallFunc() || builder_->kernel.fg.getHasStackCalls();
+
+    if (useScratchMsg_ || usesStack)
     {
-        // Read/write size when using scratch msg descriptor is 32-bytes
-        if( height == 1 && width < REG_BYTE_SIZE )
-            width = REG_BYTE_SIZE/region->getElemSize();
+        // the message will read/write a minimum of one GRF
+        if (height == 1 && width < getGRFSize())
+            width = getGRFSize() / region->getElemSize();
     }
 
     G4_Declare * transientRangeDeclare =

Original file line number	Diff line number	Diff line change
`@@ -1245,11 +1245,13 @@ SpillManagerGRF::createTransientGRFRangeDeclare (`
`1245`	`1245`	`height = 1;`
`1246`	`1246`	`}`
`1247`	`1247`
`1248`		`- if( useScratchMsg_ )`
	`1248`	`+ bool usesStack = builder_->kernel.fg.getIsStackCallFunc() \|\| builder_->kernel.fg.getHasStackCalls();`
	`1249`	`+`
	`1250`	`+ if (useScratchMsg_ \|\| usesStack)`
`1249`	`1251`	`{`
`1250`		`- // Read/write size when using scratch msg descriptor is 32-bytes`
`1251`		`- if( height == 1 && width < REG_BYTE_SIZE )`
`1252`		`- width = REG_BYTE_SIZE/region->getElemSize();`
	`1252`	`+ // the message will read/write a minimum of one GRF`
	`1253`	`+ if (height == 1 && width < getGRFSize())`
	`1254`	`+ width = getGRFSize() / region->getElemSize();`
`1253`	`1255`	`}`
`1254`	`1256`
`1255`	`1257`	`G4_Declare * transientRangeDeclare =`