[incubator-tvm] branch v0.6 updated: [BACKPORT-0.6][Bugfix][VTA] Fix multiple transfer issue in LoadUop module (#5882)

[tqchen]

This is an automated email from the ASF dual-hosted git repository.

tqchen pushed a commit to branch v0.6
in repository https://gitbox.apache.org/repos/asf/incubator-tvm.git


The following commit(s) were added to refs/heads/v0.6 by this push:
     new 69367e7  [BACKPORT-0.6][Bugfix][VTA] Fix multiple transfer issue in 
LoadUop module (#5882)
69367e7 is described below

commit 69367e7c94de90b6f6eaa6dc4c30bc170e38d26e
Author: Liangfu Chen <liangfu.c...@icloud.com>
AuthorDate: Mon Jun 22 23:32:13 2020 +0800

    [BACKPORT-0.6][Bugfix][VTA] Fix multiple transfer issue in LoadUop module 
(#5882)
    
    Co-authored-by: Liangfu Chen <lian...@amazon.com>
---
 vta/hardware/chisel/src/main/scala/core/LoadUop.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vta/hardware/chisel/src/main/scala/core/LoadUop.scala 
b/vta/hardware/chisel/src/main/scala/core/LoadUop.scala
index fcde836..dfa0b99 100644
--- a/vta/hardware/chisel/src/main/scala/core/LoadUop.scala
+++ b/vta/hardware/chisel/src/main/scala/core/LoadUop.scala
@@ -173,7 +173,7 @@ class LoadUop(debug: Boolean = false)(implicit p: 
Parameters) extends Module {
         }
       }
       .elsewhen(io.vme_rd.data.fire()) {
-        when(xcnt === xlen - 1.U) {
+      when((xcnt === xlen - 1.U) && (xrem === 0.U)) {
           wmask := "b_01".U.asTypeOf(wmask)
         }.otherwise {
           wmask := "b_11".U.asTypeOf(wmask)
@@ -183,7 +183,7 @@ class LoadUop(debug: Boolean = false)(implicit p: 
Parameters) extends Module {
     when(io.vme_rd.cmd.fire()) {
       wmask := "b_10".U.asTypeOf(wmask)
     }.elsewhen(io.vme_rd.data.fire()) {
-      when(sizeIsEven && xcnt === xlen - 1.U) {
+      when(sizeIsEven && (xcnt === xlen - 1.U) && (xrem === 0.U)) {
         wmask := "b_01".U.asTypeOf(wmask)
       }.otherwise {
         wmask := "b_11".U.asTypeOf(wmask)