summaryrefslogtreecommitdiff
path: root/src/gpgpu-sim/shader.h
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2010-10-05 21:57:01 -0800
committerTor Aamodt <[email protected]>2010-10-05 21:57:01 -0800
commit6cd75fefce592e193ddb2cdc90842664682ff281 (patch)
tree302a9731b8d78a6ac55f7ddafff92a15c8a65c76 /src/gpgpu-sim/shader.h
parente0f1b4359832ba2952ddcff3a400cd7e1e3d02b5 (diff)
bug fixes
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7815]
Diffstat (limited to 'src/gpgpu-sim/shader.h')
-rw-r--r--src/gpgpu-sim/shader.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h
index 7423025..d9a8825 100644
--- a/src/gpgpu-sim/shader.h
+++ b/src/gpgpu-sim/shader.h
@@ -889,12 +889,8 @@ class mshr_shader_unit {
public:
mshr_shader_unit( const shader_core_config *config );
- bool has_mshr(unsigned num)
- {
- return (num <= m_free_list.size());
- }
+ bool has_mshr(unsigned num) const { return (num <= m_free_list.size()); }
- //return queue access; (includes texture pipeline return)
mshr_entry* return_head();
//return queue pop; (includes texture pipeline return)
@@ -1125,7 +1121,6 @@ private:
ifetch_buffer_t m_inst_fetch_buffer;
pdom_warp_ctx_t **m_pdom_warp; // pdom reconvergence context for each warp
- class warp_tracker_pool *m_warp_tracker;
warp_inst_t** m_pipeline_reg;
Scoreboard *m_scoreboard;
opndcoll_rfu_t m_operand_collector;