Release V1.0

models/memory/CaffDRAM/Controller.h

@@ -36,8 +36,8 @@ class Controller : public manifold::kernel::Component {
 	template<typename T>
 	void handle_request(int, uarch::NetworkPacket* pkt);
 
-        void print_config(std::ostream&);
-        void print_stats(std::ostream&);
+    void print_config(std::ostream&);
+    void print_stats(std::ostream&);
 
 	static void Set_msg_types(int mem, int credit)
 	{

models/processor/spx/core.cc

@@ -102,6 +102,11 @@ void spx_core_t::tick()
     // This will periodically print the stats to show the progress of simulation -- for debugging
     print_stats(100000, stdout);
 #endif
+
+    if (get_qsim_osd_state() == QSIM_OSD_TERMINATED) {
+        fprintf(stdout, "SPX core %d out of insn", core_id);
+        manifold::kernel::Manifold::Terminate(); 
+    }
 }
 
 void spx_core_t::print_stats(uint64_t sampling_period, FILE *LogFile)
@@ -128,6 +133,13 @@ void spx_core_t::reset_interval_stats()
     pipeline->stats.interval.uop_count = 0;
 }
 
+void spx_core_t::print_stats(std::ostream& out)
+{
+    out << "************ SPX Core " << core_id << " [node " << node_id << "] stats *************" << endl;
+    out << "  Total clock cycles: " << (double)clock_cycle/1e6 << "M" << endl;
+    out << "  avgIPC = " << (double)pipeline->stats.uop_count / (double) clock_cycle << endl; }
+
+
 void spx_core_t::handle_cache_response(int temp, cache_request_t *cache_request)
 {
     pipeline->handle_cache_response(temp,cache_request);

models/processor/spx/core.h

@@ -38,6 +38,9 @@ class spx_core_t : public manifold::kernel::Component
     void turn_on();
     void turn_off();
 
+//    void print_config(std::ostream&);
+    void print_stats(std::ostream&);
+
     void send_qsim_proxy_request();
 
     int node_id; // manifold node ID

setup.sh

@@ -18,12 +18,22 @@ if [  -z "$QSIM_PREFIX" ]; then
     echo "Press any key to exit..."
     read inp
     exit 1
+else
+    echo "\nUsing ${bold}qsim${normal} from dir ${bold}$QSIM_PREFIX${normal}"
+    echo "Press any key to continue..."
+    read inp
 fi
 
 # install manifold-dep packages
-echo "Installing dependencies ..."
-echo "sudo apt-get -y install build-essentail libconfig++-dev openmpi-bin openmpi-common libopenmpi-dev"
-sudo apt-get -y install build-essential libconfig++-dev openmpi-bin openmpi-common libopenmpi-dev
+if hash apt-get 2>/dev/null; then
+    echo "Installing dependencies ..."
+    echo "sudo apt-get -y install build-essentail libconfig++-dev openmpi-bin openmpi-common libopenmpi-dev"
+    sudo apt-get -y install build-essential libconfig++-dev openmpi-bin openmpi-common libopenmpi-dev
+else
+    echo "please refer to manifold manual for installation dependencies"
+    echo "Press any key to continue..."
+    read dump
+fi
 
 # Build manifold simulator
 echo "Building manifold components ..."
@@ -34,13 +44,11 @@ echo "Downloading the benchmark ..."
 cd ${MANIFOLD_DIR}/simulator/smp
 mkdir -p benchmark
 cd benchmark
-wget -c "https://www.dropbox.com/s/8551vnwhzqt9fk6/graphbig_x64.tar.gz?dl=0" -O graphbig_x64.tgz 
-wget -c "https://www.dropbox.com/s/rpxgwhyr41m2oa0/graphbig_a64.tar.gz?dl=0" -O graphbig_a64.tgz 
-wget -c "https://www.dropbox.com/s/jslv1g1v77ndq8m/splash-2.tar.gz?dl=0" -O splash_x86.tgz 
+wget -c "https://github.com/gtcasl/qsim_prebuilt/releases/download/v0.1/graphBig_x86.tar.xz" -O graphbig_x86.tar.xz 
+wget -c "https://github.com/gtcasl/qsim_prebuilt/releases/download/v0.1/graphBig_a64.tar.xz" -O graphbig_a64.tar.xz
 echo "Uncompressing the benchmark ..."
-tar -xzvf graphbig_a64.tgz
-tar -xzvf graphbig_x64.tgz
-tar -xzvf splash_x86.tgz
+tar -xf graphbig_x86.tar.xz
+tar -xf graphbig_a64.tar.xz
 cd ..
 
 if [ ! -f $QSIM_PREFIX/state.64 ]; then

simulator/smp/QsimProxy/smp_l1l2.cc

@@ -80,13 +80,13 @@ int main(int argc, char** argv)
     Manifold::Run();
 
 
-    sysBuilder.print_stats();
+    sysBuilder.print_stats(cerr);
 
 
 #ifdef REDIRECT_COUT
     std::cout.rdbuf(cout_sbuf);
 #endif
 
-    Manifold :: Finalize();
+    Manifold::Finalize();
 }
 

simulator/smp/QsimProxy/smp_llp.cc

@@ -90,13 +90,13 @@ int main(int argc, char** argv)
     Manifold::Run();
 
 
-    sysBuilder.print_stats();
+    sysBuilder.print_stats(cerr);
 
 
 #ifdef REDIRECT_COUT
     std::cout.rdbuf(cout_sbuf);
 #endif
 
-    Manifold :: Finalize();
+    Manifold::Finalize();
 }
 

simulator/smp/common/proc_builder.cc

@@ -565,3 +565,13 @@ void Spx_builder :: print_config(std::ostream& out)
     out << "  config file: " << m_CONFIG_FILE << endl;
 }
 
+void Spx_builder :: print_stats(std::ostream& out)
+{
+    for(map<int,int>::iterator it = m_proc_id_cid_map.begin(); it != m_proc_id_cid_map.end(); ++it) {
+        int cid = (*it).second;
+	    spx_core_t* proc = manifold::kernel::Component :: GetComponent<spx_core_t>(cid);
+	    if(proc) {
+	        proc->print_stats(out);
+	    }
+    }
+}

simulator/smp/common/proc_builder.h

@@ -195,7 +195,7 @@ class Spx_builder : public ProcBuilder {
     void connect_proc_qsim_proxy(QsimBuilder* qsim_builder);
 
     void print_config(std::ostream&);
-    //void print_stats(std::ostream&);
+    void print_stats(std::ostream&);
 
 private:
     Qsim::OSDomain* m_qsim_osd;

simulator/smp/common/sysBuilder_llp.cc

@@ -664,13 +664,13 @@ void SysBuilder_llp :: print_config(ostream& out)
 
 //====================================================================
 //====================================================================
-void SysBuilder_llp :: print_stats()
+void SysBuilder_llp :: print_stats(ostream& out)
 {
-    m_proc_builder->print_stats(cout);
-    m_cache_builder->print_stats(cout);
-    m_mc_builder->print_stats(cout);
-    m_network_builder->print_stats(cout);
+    m_proc_builder->print_stats(out);
+    m_cache_builder->print_stats(out);
+    m_mc_builder->print_stats(out);
+    m_network_builder->print_stats(out);
 
-    Manifold :: print_stats(cout);
+    Manifold::print_stats(out);
 }
 

simulator/smp/common/sysBuilder_llp.h

@@ -40,7 +40,7 @@ class SysBuilder_llp {
 
     void pre_simulation();
     void print_config(std::ostream& out);
-    void print_stats();
+    void print_stats(std::ostream& out);
 
     libconfig::Config m_config;