Skip to content

Commit

Permalink
updated EXPECTED files and ../core/Inst.hpp for whitespace between pi…
Browse files Browse the repository at this point in the history 
…d and status
  • Loading branch information
@dragon540
dragon540 committed Oct 19, 2024
1 parent caddbf3 commit 515e160
Show file tree
Hide file tree
Showing 11 changed files with 497 additions and 497 deletions.
2 changes: 1 addition & 1 deletion core/Inst.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ namespace olympia
// - any changes here will break EXPECT
inline std::ostream & operator<<(std::ostream & os, const Inst & inst)
{
os << "uid:" << inst.getUniqueID() << std::setw(10) << inst.getStatus() << " "
os << "uid:" << inst.getUniqueID() << " " << std::setw(10) << inst.getStatus() << " "
<< std::hex << inst.getPC() << std::dec << " pid:" << inst.getProgramID()
<< " uopid:" << inst.getUOpID() << " '" << inst.getDisasm() << "' ";
return os;
Expand Down
86 changes: 43 additions & 43 deletions test/core/dcache/expected_output/arbitrate.out.EXPECTED
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,70 @@
#Exe:
#SimulatorVersion:
#Repro:
#Start: Tuesday Tue Oct 8 16:49:19 2024
#Elapsed: 0.00278s
{0000000000 00000000 top.lsu info} req_inst_: Instruction: 'uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' ' Requested
{0000000000 00000000 top.dcache info} receiveMemReqFromLSU_: Received memory access request from LSU memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000000 00000000 top.dcache info} arbitrateL2LsuReq_: Received LSU request memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
#Start: Saturday Sat Oct 19 15:35:23 2024
#Elapsed: 0.002073s
{0000000000 00000000 top.lsu info} req_inst_: Instruction: 'uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' ' Requested
{0000000000 00000000 top.dcache info} receiveMemReqFromLSU_: Received memory access request from LSU memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000000 00000000 top.dcache info} arbitrateL2LsuReq_: Received LSU request memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000001 00000001 top.dcache info} handleLookup_: Lookup stage
{0000000001 00000001 top.dcache info} handleLookup_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' in Lookup stage
{0000000001 00000001 top.dcache info} handleLookup_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' in Lookup stage
{0000000001 00000001 top.dcache info} dataLookup_: DL1 DCache MISS: phyAddr=0xdeadbeef
{0000000001 00000001 top.dcache info} handleLookup_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' performing lookup 0
{0000000001 00000001 top.dcache info} handleLookup_: Creating new MSHR Entry memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000001 00000001 top.dcache info} handleLookup_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' performing lookup 0
{0000000001 00000001 top.dcache info} handleLookup_: Creating new MSHR Entry memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000001 00000001 top.dcache info} handleLookup_: Load miss inst to LMQ; block address:0xdeadbee0
{0000000001 00000001 top.lsu info} ReceiveAck_: Ack: 'memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' ' Received
{0000000001 00000001 top.lsu info} ReceiveAck_: Ack: 'memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' ' Received
{0000000001 00000001 top.dcache info} mshrRequest_: Send mshr req
{0000000001 00000001 top.dcache info} mshrRequest_: Sending mshr request when not busy memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000002 00000002 top.next_lvl info} sinkInst_: Instruction: 'uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' ' sinked
{0000000001 00000001 top.dcache info} mshrRequest_: Sending mshr request when not busy memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000002 00000002 top.next_lvl info} sinkInst_: Instruction: 'uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' ' sinked
{0000000002 00000002 top.dcache info} handleDataRead_: Data Read stage
{0000000002 00000002 top.dcache info} handleDataRead_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' in read stage
{0000000002 00000002 top.lsu info} ReceiveAck_: Ack: 'memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' ' Received
{0000000002 00000002 top.dcache info} handleDataRead_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' in read stage
{0000000002 00000002 top.lsu info} ReceiveAck_: Ack: 'memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' ' Received
{0000000003 00000003 top.dcache info} handleDeallocate_: Data Dellocate stage
{0000000003 00000003 top.dcache info} handleDeallocate_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' in deallocate stage
{0000000003 00000003 top.dcache info} handleDeallocate_: Deallocating pipeline for memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000003 00000003 top.dcache info} handleDeallocate_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' in deallocate stage
{0000000003 00000003 top.dcache info} handleDeallocate_: Deallocating pipeline for memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000003 00000003 top.dcache info} mshrRequest_: Send mshr req
{0000000007 00000007 top.dcache info} receiveRespFromL2Cache_: Received cache refill memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000007 00000007 top.dcache info} receiveRespFromL2Cache_: Removing mshr entry for memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000007 00000007 top.dcache info} arbitrateL2LsuReq_: Received Refill request memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000007 00000007 top.dcache info} receiveRespFromL2Cache_: Received cache refill memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000007 00000007 top.dcache info} receiveRespFromL2Cache_: Removing mshr entry for memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000007 00000007 top.dcache info} arbitrateL2LsuReq_: Received Refill request memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000008 00000008 top.dcache info} handleLookup_: Lookup stage
{0000000008 00000008 top.dcache info} handleLookup_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' in Lookup stage
{0000000008 00000008 top.dcache info} handleLookup_: Incoming cache refill memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000008 00000008 top.lsu info} req_inst_: Instruction: 'uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' ' Requested
{0000000008 00000008 top.dcache info} receiveMemReqFromLSU_: Received memory access request from LSU memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000008 00000008 top.dcache info} handleLookup_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' in Lookup stage
{0000000008 00000008 top.dcache info} handleLookup_: Incoming cache refill memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000008 00000008 top.lsu info} req_inst_: Instruction: 'uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' ' Requested
{0000000008 00000008 top.dcache info} receiveMemReqFromLSU_: Received memory access request from LSU memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000008 00000008 top.dcache info} mshrRequest_: Send mshr req
{0000000008 00000008 top.dcache info} arbitrateL2LsuReq_: Received LSU request memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000008 00000008 top.dcache info} arbitrateL2LsuReq_: Received LSU request memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000009 00000009 top.dcache info} handleLookup_: Lookup stage
{0000000009 00000009 top.dcache info} handleLookup_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' in Lookup stage
{0000000009 00000009 top.dcache info} handleLookup_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' in Lookup stage
{0000000009 00000009 top.dcache info} dataLookup_: DL1 DCache MISS: phyAddr=0xdeedbeef
{0000000009 00000009 top.dcache info} handleLookup_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' performing lookup 0
{0000000009 00000009 top.dcache info} handleLookup_: Creating new MSHR Entry memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000009 00000009 top.dcache info} handleLookup_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' performing lookup 0
{0000000009 00000009 top.dcache info} handleLookup_: Creating new MSHR Entry memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000009 00000009 top.dcache info} handleLookup_: Load miss inst to LMQ; block address:0xdeedbee0
{0000000009 00000009 top.lsu info} ReceiveAck_: Ack: 'memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' ' Received
{0000000009 00000009 top.lsu info} ReceiveAck_: Ack: 'memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' ' Received
{0000000009 00000009 top.dcache info} handleDataRead_: Data Read stage
{0000000009 00000009 top.dcache info} handleDataRead_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' in read stage
{0000000009 00000009 top.dcache info} handleDataRead_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' in read stage
{0000000009 00000009 top.dcache info} reloadCache_: DCache reload complete!
{0000000009 00000009 top.dcache info} mshrRequest_: Send mshr req
{0000000009 00000009 top.dcache info} mshrRequest_: Sending mshr request when not busy memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000010 00000010 top.next_lvl info} sinkInst_: Instruction: 'uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' ' sinked
{0000000009 00000009 top.dcache info} mshrRequest_: Sending mshr request when not busy memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000010 00000010 top.next_lvl info} sinkInst_: Instruction: 'uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' ' sinked
{0000000010 00000010 top.dcache info} handleDataRead_: Data Read stage
{0000000010 00000010 top.dcache info} handleDataRead_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' in read stage
{0000000010 00000010 top.lsu info} ReceiveAck_: Ack: 'memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' ' Received
{0000000010 00000010 top.dcache info} handleDataRead_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' in read stage
{0000000010 00000010 top.lsu info} ReceiveAck_: Ack: 'memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' ' Received
{0000000010 00000010 top.dcache info} handleDeallocate_: Data Dellocate stage
{0000000010 00000010 top.dcache info} handleDeallocate_: memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3' in deallocate stage
{0000000010 00000010 top.lsu info} ReceiveAck_: Ack: 'memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' ' Received
{0000000010 00000010 top.dcache info} handleDeallocate_: Removing mshr entry for memptr: uid:0 FETCHED 0 pid:1 uopid:0 'lw 5,3'
{0000000010 00000010 top.dcache info} handleDeallocate_: memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3' in deallocate stage
{0000000010 00000010 top.lsu info} ReceiveAck_: Ack: 'memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' ' Received
{0000000010 00000010 top.dcache info} handleDeallocate_: Removing mshr entry for memptr: deadbeef uid:0 BEFORE_FETCH 0 pid:1 uopid:0 'lw 5,3'
{0000000011 00000011 top.dcache info} handleDeallocate_: Data Dellocate stage
{0000000011 00000011 top.dcache info} handleDeallocate_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' in deallocate stage
{0000000011 00000011 top.dcache info} handleDeallocate_: Deallocating pipeline for memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000011 00000011 top.dcache info} handleDeallocate_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' in deallocate stage
{0000000011 00000011 top.dcache info} handleDeallocate_: Deallocating pipeline for memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000011 00000011 top.dcache info} mshrRequest_: Send mshr req
{0000000015 00000015 top.dcache info} receiveRespFromL2Cache_: Received cache refill memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000015 00000015 top.dcache info} arbitrateL2LsuReq_: Received Refill request memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000015 00000015 top.dcache info} receiveRespFromL2Cache_: Received cache refill memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000015 00000015 top.dcache info} arbitrateL2LsuReq_: Received Refill request memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000016 00000016 top.dcache info} handleLookup_: Lookup stage
{0000000016 00000016 top.dcache info} handleLookup_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' in Lookup stage
{0000000016 00000016 top.dcache info} handleLookup_: Incoming cache refill memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3'
{0000000016 00000016 top.dcache info} handleLookup_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' in Lookup stage
{0000000016 00000016 top.dcache info} handleLookup_: Incoming cache refill memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3'
{0000000016 00000016 top.dcache info} mshrRequest_: Send mshr req
{0000000017 00000017 top.dcache info} handleDataRead_: Data Read stage
{0000000017 00000017 top.dcache info} handleDataRead_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' in read stage
{0000000017 00000017 top.dcache info} handleDataRead_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' in read stage
{0000000017 00000017 top.dcache info} reloadCache_: DCache reload complete!
{0000000018 00000018 top.dcache info} handleDeallocate_: Data Dellocate stage
{0000000018 00000018 top.dcache info} handleDeallocate_: memptr: uid:1 FETCHED 0 pid:2 uopid:0 'lw 5,3' in deallocate stage
{0000000018 00000018 top.dcache info} handleDeallocate_: memptr: deedbeef uid:1 BEFORE_FETCH 0 pid:2 uopid:0 'lw 5,3' in deallocate stage
Loading

0 comments on commit 515e160

Please sign in to comment.