Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67051?usp=email )
Change subject: misc: Merge branch stable into develop branch
......................................................................
misc: Merge branch stable into develop branch
This ensures both branches are in-sync and have not diverged.
Change-Id: Ib487d8596037017b9ec03d7e8a76229373c153db
---
M src/dev/amdgpu/pm4_packet_processor.cc
M src/dev/amdgpu/sdma_engine.cc
M src/dev/amdgpu/sdma_engine.hh
4 files changed, 60 insertions(+), 34 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Bobby Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/amdgpu/pm4_packet_processor.cc
b/src/dev/amdgpu/pm4_packet_processor.cc
index 3c832c5..152fd4d 100644
--- a/src/dev/amdgpu/pm4_packet_processor.cc
+++ b/src/dev/amdgpu/pm4_packet_processor.cc
@@ -458,13 +458,7 @@
SDMAEngine *sdma_eng = gpuDevice->getSDMAById(pkt->engineSel - 2);
// Register RLC queue with SDMA
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
sdma_eng->registerRLCQueue(pkt->doorbellOffset << 2, addr, mqd);
-=======
- sdma_eng->registerRLCQueue(pkt->doorbellOffset << 2,
- mqd->rb_base << 8, rlc_size,
- rptr_wb_addr);
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
// Register doorbell with GPU device
gpuDevice->setSDMAEngine(pkt->doorbellOffset << 2, sdma_eng);
diff --git a/src/dev/amdgpu/sdma_engine.cc b/src/dev/amdgpu/sdma_engine.cc
index 0a167bf..4c03bf5 100644
--- a/src/dev/amdgpu/sdma_engine.cc
+++ b/src/dev/amdgpu/sdma_engine.cc
@@ -165,12 +165,7 @@
}
void
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
SDMAEngine::registerRLCQueue(Addr doorbell, Addr mqdAddr, SDMAQueueDesc
*mqd)
-=======
-SDMAEngine::registerRLCQueue(Addr doorbell, Addr rb_base, uint32_t size,
- Addr rptr_wb_addr)
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
{
uint32_t rlc_size = 4UL << bits(mqd->sdmax_rlcx_rb_cntl, 6, 1);
Addr rptr_wb_addr = mqd->sdmax_rlcx_rb_rptr_addr_hi;
@@ -185,43 +180,25 @@
rlc0.base(mqd->rb_base << 8);
rlc0.size(rlc_size);
rlc0.rptr(0);
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
rlc0.incRptr(mqd->rptr);
rlc0.setWptr(mqd->wptr);
-=======
- rlc0.wptr(0);
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
rlc0.rptrWbAddr(rptr_wb_addr);
rlc0.processing(false);
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
rlc0.setMQD(mqd);
rlc0.setMQDAddr(mqdAddr);
-=======
- rlc0.size(size);
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
} else if (!rlc1.valid()) {
DPRINTF(SDMAEngine, "Doorbell %lx mapped to RLC1\n", doorbell);
rlcInfo[1] = doorbell;
rlc1.valid(true);
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
rlc1.base(mqd->rb_base << 8);
rlc1.size(rlc_size);
rlc1.rptr(0);
rlc1.incRptr(mqd->rptr);
rlc1.setWptr(mqd->wptr);
-=======
- rlc1.base(rb_base);
- rlc1.rptr(0);
- rlc1.wptr(0);
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
rlc1.rptrWbAddr(rptr_wb_addr);
rlc1.processing(false);
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
rlc1.setMQD(mqd);
rlc1.setMQDAddr(mqdAddr);
-=======
- rlc1.size(size);
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
} else {
panic("No free RLCs. Check they are properly unmapped.");
}
diff --git a/src/dev/amdgpu/sdma_engine.hh b/src/dev/amdgpu/sdma_engine.hh
index 6a12f97..27c1691 100644
--- a/src/dev/amdgpu/sdma_engine.hh
+++ b/src/dev/amdgpu/sdma_engine.hh
@@ -287,12 +287,7 @@
/**
* Methods for RLC queues
*/
-<<<<<<< HEAD (fcde59 util: ext/systemc is importing env Environment
instead of ma)
void registerRLCQueue(Addr doorbell, Addr mqdAddr, SDMAQueueDesc *mqd);
-=======
- void registerRLCQueue(Addr doorbell, Addr rb_base, uint32_t size,
- Addr rptr_wb_addr);
->>>>>>> BRANCH (5fa484 misc: Merge the v22.1 release staging into stable)
void unregisterRLCQueue(Addr doorbell);
void deallocateRLCQueues();
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67051?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib487d8596037017b9ec03d7e8a76229373c153db
Gerrit-Change-Number: 67051
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
