Bugfix for copying from stack, remaining bytes less than OWORD size

dlei6g · sys_zuul · commit 2785473f50a6 · 2020-03-16T16:55:16.000-07:00
Change-Id: I129cf5120b136c75b7c57cc316da2654916610ef
diff --git a/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp b/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp
@@ -9597,7 +9597,7 @@ void EmitPass::emitStackCall(llvm::CallInst* inst)
                 CVariable* pStackOffset = m_currShader->ImmToVariable(RdBytes, ISA_TYPE_UD);
                 emitAddSP(pTempVar, pSP, pStackOffset);
 
-                bool needRmCopy = RdSize == SIZE_OWORD && RmnBytes < SIZE_OWORD;
+                bool needRmCopy = RdSize == SIZE_OWORD && RmnBytes > 0 && RmnBytes < SIZE_OWORD;
                 if (!needRmCopy)
                 {
                     if (is64BitSP)
@@ -9619,9 +9619,9 @@ void EmitPass::emitStackCall(llvm::CallInst* inst)
                         if (is64BitSP)
                             m_encoder->OWLoadA64(pTempDst, pTempVar, SIZE_OWORD);
                         else
-                            m_encoder->OWLoad(pTempDst, resource, pTempVar, false, RdSize);
+                            m_encoder->OWLoad(pTempDst, resource, pTempVar, false, SIZE_OWORD);
                         m_encoder->Push();
-                        emitVectorCopy(Dst, pTempDst, RdSize / elemSize, RdBytes, 0);
+                        emitVectorCopy(Dst, pTempDst, RmnBytes / elemSize, RdBytes, 0);
                     }
                 }
                 RdBytes += RdSize;
@@ -9770,7 +9770,8 @@ void EmitPass::emitStackFuncEntry(Function* F, bool ptr64bits)
                     EALIGN_HWORD, false, 1);
             }
 
-            bool needRmCopy = RdSize == SIZE_OWORD && LdDst->GetSize() < (DstOffset + RdSize);
+            int RmnBytes = LdDst->GetSize() - DstOffset;
+            bool needRmCopy = RdSize == SIZE_OWORD && RmnBytes > 0 && RmnBytes < SIZE_OWORD;
             if (!needRmCopy)
             {
                 if (is64bitSP)
@@ -9793,9 +9794,9 @@ void EmitPass::emitStackFuncEntry(Function* F, bool ptr64bits)
                     if (is64bitSP)
                         m_encoder->OWLoadA64(pTempDst, pTempVar, SIZE_OWORD);
                     else
-                        m_encoder->OWLoad(pTempDst, resource, pTempVar, false, RdSize);
+                        m_encoder->OWLoad(pTempDst, resource, pTempVar, false, SIZE_OWORD);
                     m_encoder->Push();
-                    emitVectorCopy(LdDst, pTempDst, RdSize / ldDstElemSize, DstOffset, 0);
+                    emitVectorCopy(LdDst, pTempDst, RmnBytes / ldDstElemSize, DstOffset, 0);
                 }
             }
             if (LdDst != Dst)

Original file line number	Diff line number	Diff line change
`@@ -9597,7 +9597,7 @@ void EmitPass::emitStackCall(llvm::CallInst* inst)`
`9597`	`9597`	`CVariable* pStackOffset = m_currShader->ImmToVariable(RdBytes, ISA_TYPE_UD);`
`9598`	`9598`	`emitAddSP(pTempVar, pSP, pStackOffset);`
`9599`	`9599`
`9600`		`- bool needRmCopy = RdSize == SIZE_OWORD && RmnBytes < SIZE_OWORD;`
	`9600`	`+ bool needRmCopy = RdSize == SIZE_OWORD && RmnBytes > 0 && RmnBytes < SIZE_OWORD;`
`9601`	`9601`	`if (!needRmCopy)`
`9602`	`9602`	`{`
`9603`	`9603`	`if (is64BitSP)`
`@@ -9619,9 +9619,9 @@ void EmitPass::emitStackCall(llvm::CallInst* inst)`
`9619`	`9619`	`if (is64BitSP)`
`9620`	`9620`	`m_encoder->OWLoadA64(pTempDst, pTempVar, SIZE_OWORD);`
`9621`	`9621`	`else`
`9622`		`- m_encoder->OWLoad(pTempDst, resource, pTempVar, false, RdSize);`
	`9622`	`+ m_encoder->OWLoad(pTempDst, resource, pTempVar, false, SIZE_OWORD);`
`9623`	`9623`	`m_encoder->Push();`
`9624`		`- emitVectorCopy(Dst, pTempDst, RdSize / elemSize, RdBytes, 0);`
	`9624`	`+ emitVectorCopy(Dst, pTempDst, RmnBytes / elemSize, RdBytes, 0);`
`9625`	`9625`	`}`
`9626`	`9626`	`}`
`9627`	`9627`	`RdBytes += RdSize;`
`@@ -9770,7 +9770,8 @@ void EmitPass::emitStackFuncEntry(Function* F, bool ptr64bits)`
`9770`	`9770`	`EALIGN_HWORD, false, 1);`
`9771`	`9771`	`}`
`9772`	`9772`
`9773`		`- bool needRmCopy = RdSize == SIZE_OWORD && LdDst->GetSize() < (DstOffset + RdSize);`
	`9773`	`+ int RmnBytes = LdDst->GetSize() - DstOffset;`
	`9774`	`+ bool needRmCopy = RdSize == SIZE_OWORD && RmnBytes > 0 && RmnBytes < SIZE_OWORD;`
`9774`	`9775`	`if (!needRmCopy)`
`9775`	`9776`	`{`
`9776`	`9777`	`if (is64bitSP)`
`@@ -9793,9 +9794,9 @@ void EmitPass::emitStackFuncEntry(Function* F, bool ptr64bits)`
`9793`	`9794`	`if (is64bitSP)`
`9794`	`9795`	`m_encoder->OWLoadA64(pTempDst, pTempVar, SIZE_OWORD);`
`9795`	`9796`	`else`
`9796`		`- m_encoder->OWLoad(pTempDst, resource, pTempVar, false, RdSize);`
	`9797`	`+ m_encoder->OWLoad(pTempDst, resource, pTempVar, false, SIZE_OWORD);`
`9797`	`9798`	`m_encoder->Push();`
`9798`		`- emitVectorCopy(LdDst, pTempDst, RdSize / ldDstElemSize, DstOffset, 0);`
	`9799`	`+ emitVectorCopy(LdDst, pTempDst, RmnBytes / ldDstElemSize, DstOffset, 0);`
`9799`	`9800`	`}`
`9800`	`9801`	`}`
`9801`	`9802`	`if (LdDst != Dst)`