diff options
| author | Mahmoud <[email protected]> | 2018-11-18 12:05:40 -0500 |
|---|---|---|
| committer | Mahmoud <[email protected]> | 2018-11-18 12:05:40 -0500 |
| commit | 773dcd0072e8d5e38377632f307d93ee856f5f73 (patch) | |
| tree | 1d86d6c0b0c695eeef25490bb79ec53c9bd275cb /src/cuda-sim/cuda-sim.h | |
| parent | 72c30bd7a251081eb7453ff4706ddcda30c744ac (diff) | |
| parent | 8ec70c69eb89c1fa836c233be3e4c478602d9bb7 (diff) | |
Merge branch 'dev' of https://github.com/gpgpu-sim/gpgpu-sim_distribution into dev
Diffstat (limited to 'src/cuda-sim/cuda-sim.h')
| -rw-r--r-- | src/cuda-sim/cuda-sim.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cuda-sim/cuda-sim.h b/src/cuda-sim/cuda-sim.h index 958daba..abd32f9 100644 --- a/src/cuda-sim/cuda-sim.h +++ b/src/cuda-sim/cuda-sim.h @@ -32,6 +32,7 @@ #include"../gpgpu-sim/shader.h" #include <stdlib.h> #include <map> +#include <vector> #include <string> #include"ptx_sim.h" @@ -97,7 +98,7 @@ public: delete[] m_warpAtBarrier; } //! executes all warps till completion - void execute(); + void execute(int inst_count, unsigned ctaid_cp); virtual void warp_exit( unsigned warp_id ); virtual bool warp_waiting_at_barrier( unsigned warp_id ) const { @@ -107,7 +108,7 @@ public: private: void executeWarp(unsigned, bool &, bool &); //initializes threads in the CTA block which we are executing - void initializeCTA(); + void initializeCTA(unsigned ctaid_cp); virtual void checkExecutionStatusAndUpdate(warp_inst_t &inst, unsigned t, unsigned tid) { if(m_thread[tid]==NULL || m_thread[tid]->is_done()){ |