Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean #2415

Merged
merged 2 commits into from
Nov 7, 2024
Merged

SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a25a4b7
miranda: check request operation instead of using dynamic_cast
heyitsanthony Oct 25, 2024
48cbb8c
Merge Pull Request #2411 from heyitsanthony/sst-elements/anthony/mira…
sst-autotester Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/sst/elements/miranda/mirandaCPU.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,10 @@ bool RequestGenCPU::clockTick(SST::Cycle_t cycle) {
break;
}

MemoryOpRequest* memOpReq;
GeneratorRequest* nxtRq = pendingRequests.at(i);
ReqOperation op = nxtRq->getOperation();

if(nxtRq->getOperation() == REQ_FENCE) {
if(op == REQ_FENCE) {
if(0 == requestsInFlight.size()) {
out->verbose(CALL_INFO, 4, 0, "Fence operation completed, no pending requests, will be retired.\n");

Expand All @@ -483,7 +483,7 @@ bool RequestGenCPU::clockTick(SST::Cycle_t cycle) {

// Fence operations do now allow anything else to complete in this cycle
break;
} else if (nxtRq->getOperation() == CUSTOM) {
} else if (op == CUSTOM) {
if (requestsPending[CUSTOM] < maxRequestsPending[CUSTOM]) {
out->verbose(CALL_INFO, 4, 0, "Will attempt to issue as free slots in the load/store unit.\n");

Expand All @@ -501,9 +501,9 @@ bool RequestGenCPU::clockTick(SST::Cycle_t cycle) {
delete nxtRq;
}
}
} else if ( ( memOpReq = dynamic_cast<MemoryOpRequest*>(nxtRq) ) ) {

if( requestsPending[memOpReq->getOperation()] < maxRequestsPending[memOpReq->getOperation()] ) {
} else if (op == READ || op == WRITE) {
if( requestsPending[op] < maxRequestsPending[op] ) {
auto memOpReq = static_cast<MemoryOpRequest*>(nxtRq);
out->verbose(CALL_INFO, 4, 0, "Will attempt to issue as free slots in the load/store unit.\n");


Expand Down
5 changes: 3 additions & 2 deletions src/sst/elements/miranda/mirandaGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,13 @@ class MemoryOpRequest : public GeneratorRequest {
const uint64_t cLength,
const ReqOperation cOpType) :
GeneratorRequest(),
addr(cAddr), length(cLength), op(cOpType) {}
addr(cAddr), length(cLength), op(cOpType)
{ assert (op == READ || op == WRITE); }

~MemoryOpRequest() {}
ReqOperation getOperation() const { return op; }
bool isRead() const { return op == READ; }
bool isWrite() const { return op == WRITE; }
bool isCustom() const { return op == CUSTOM; }
uint64_t getAddress() const { return addr; }
uint64_t getLength() const { return length; }

Expand Down
Loading