Raise exception in LSU when ROB is drained

core/CPUFactory.cpp

@@ -94,6 +94,10 @@ auto olympia::CPUFactory::bindTree_(sparta::RootTreeNode* root_node,
                 setTLB(*private_nodes_.at(num_of_cores)->getResourceAs<olympia::SimpleTLB>());
         (core_tree_node->getChild("preloader")->getResourceAs<olympia::Preloader>())->
             preload();
+        auto rob = core_tree_node->getChild("rob")->getResourceAs<olympia::ROB>()->getContainer();
+        auto lsu = core_tree_node->getChild("lsu")->getResourceAs<olympia::LSU>();
+        rob->registerForNotification<bool, LSU, &LSU::onRobDrained_>
+            (lsu, "rob_notif_channel");
     }
 }
 

core/LSU.cpp

@@ -80,7 +80,10 @@ namespace olympia
         // Both cache and MMU try to drive the single BIU port at the same cycle
         // Here we give cache the higher priority
         ILOG("LSU construct: #" << node->getGroupIdx());
+    }
 
+    void LSU::onRobDrained_(const bool &val){
+        retire_done_and_is_drained_ = val;
     }
 
     LSU::~LSU()  {
@@ -92,6 +95,11 @@ namespace olympia
              << ": "
              << memory_access_allocator_.getNumAllocated()
              << " MemoryAccessInfo objects allocated/created");
+
+        if(retire_done_and_is_drained_){
+            bool ldst_queue_empty_ = ldst_inst_queue_.empty();
+            sparta_assert(ldst_queue_empty_, "Issue queue has pending instructions");
+        }
     }
 
     ////////////////////////////////////////////////////////////////////////////////
@@ -453,6 +461,14 @@ namespace olympia
         // Otherwise, assertion error is fired inside arbitrateInstIssue_()
     }
 
+    void LSU::dumpDebugContent_(std::ostream & output) const
+    {
+        output << "LSU Contents" << std::endl;
+        for (const auto & entry : ldst_inst_queue_)
+        {
+            output << '\t' << entry << std::endl;
+        }
+    }
 
     ////////////////////////////////////////////////////////////////////////////////
     // Regular Function/Subroutine Call

core/LSU.hpp

@@ -69,7 +69,7 @@ namespace olympia
         // Type Name/Alias Declaration
         ////////////////////////////////////////////////////////////////////////////////
 
-
+        bool retire_done_and_is_drained_ = false;
         class LoadStoreInstInfo;
 
         using LoadStoreInstInfoPtr = sparta::SpartaSharedPointer<LoadStoreInstInfo>;
@@ -196,6 +196,8 @@ namespace olympia
                                   SPARTA_ADDPAIR("state", &LoadStoreInstInfo::getState),
                                   SPARTA_FLATTEN(         &LoadStoreInstInfo::getMemoryAccessInfoPtr))
         };
+
+        void onRobDrained_(const bool &val);
     private:
 
         using ScoreboardViews = std::array<std::unique_ptr<sparta::ScoreboardView>, core_types::N_REGFILES>;
@@ -293,7 +295,6 @@ namespace olympia
         ////////////////////////////////////////////////////////////////////////////////
         // Callbacks
         ////////////////////////////////////////////////////////////////////////////////
-
         // Send initial credits (ldst_inst_queue_size_) to Dispatch Unit
         void sendInitialCredits_();
 
@@ -325,6 +326,7 @@ namespace olympia
         // Handle instruction flush in LSU
         void handleFlush_(const FlushCriteria &);
 
+        void dumpDebugContent_(std::ostream& output) const override final;
         ////////////////////////////////////////////////////////////////////////////////
         // Regular Function/Subroutine Call
         ////////////////////////////////////////////////////////////////////////////////

core/ROB.cpp

@@ -53,6 +53,12 @@ namespace olympia
         // simulation continuing on.
         ev_ensure_forward_progress_.setContinuing(false);
 
+        rob_drained_notif_source_.reset(new sparta::NotificationSource<bool>(
+            this->getContainer(),
+            "rob_notif_channel",
+            "Notification channel for rob",
+            "rob_notif_channel"
+        ));
         // Send initial credits to anyone that cares.  Probably Dispatch.
         sparta::StartupEvent(node, CREATE_SPARTA_HANDLER(ROB, sendInitialCredits_));
     }
@@ -198,6 +204,7 @@ namespace olympia
 
     void ROB::onStartingTeardown_() {
         if ((reorder_buffer_.size() > 0) && (false == rob_stopped_simulation_)) {
+            rob_drained_notif_source_->postNotification(true);
             std::cerr << "WARNING! Simulation is ending, but the ROB didn't stop it.  Lock up situation?" << std::endl;
             dumpDebugContent_(std::cerr);
         }

core/ROB.hpp

@@ -116,6 +116,8 @@ namespace olympia
         sparta::Event<> ev_ensure_forward_progress_{&unit_event_set_, "forward_progress_check",
                 CREATE_SPARTA_HANDLER(ROB, checkForwardProgress_)};
 
+        std::unique_ptr<sparta::NotificationSource<bool>> rob_drained_notif_source_;
+
         void sendInitialCredits_();
         void retireEvent_();
         void robAppended_(const InstGroup &);

test/core/rename/Rename_test.cpp

@@ -133,6 +133,14 @@ class olympia::LSUTester
         // while the ADD instruction is running, the STORE instruction should NOT issue
         EXPECT_TRUE(lsu.lsu_insts_issued_ == 0);
     }
+
+    void clear_entries(olympia::LSU &lsu){
+        auto iter = lsu.ldst_inst_queue_.begin();
+        while(iter != lsu.ldst_inst_queue_.end()){
+            auto x(iter++);
+            lsu.ldst_inst_queue_.erase(x);
+        }
+    }
 };
 
 //
@@ -427,6 +435,7 @@ void runTest(int argc, char **argv)
         cls.runSimulator(&sim, 6);
         executepipe_tester.test_dependent_integer_first_instruction(*my_executepipe);
         lsu_tester.test_dependent_lsu_instruction(*my_lsu);
+        lsu_tester.clear_entries(*my_lsu);
     }
     else if(input_file == "raw_float_lsu.json"){
         // testing RAW dependency for data operand
@@ -440,6 +449,7 @@ void runTest(int argc, char **argv)
         cls.runSimulator(&sim, 6);
         executepipe_tester.test_dependent_integer_first_instruction(*my_executepipe);
         lsu_tester.test_dependent_lsu_instruction(*my_lsu);
+        lsu_tester.clear_entries(*my_lsu);
     }
     else{
         sparta::Scheduler sched;