diff options
| author | Tor Aamodt <[email protected]> | 2010-07-29 22:02:01 -0800 |
|---|---|---|
| committer | Tor Aamodt <[email protected]> | 2010-07-29 22:02:01 -0800 |
| commit | fcb7e0b302639ef4bca589b43d8a57d2dec623e5 (patch) | |
| tree | 37d695acd66030d0151a7f4056591f5c9d72a1f8 /src/gpgpu-sim/shader.cc | |
| parent | 503cda930217158d43d136aea1893f0d30df32a6 (diff) | |
compiling (not operand collector probably won't work for anything using tex instructions currently)
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7106]
Diffstat (limited to 'src/gpgpu-sim/shader.cc')
| -rw-r--r-- | src/gpgpu-sim/shader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index 8ebf655..d3780a8 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -125,6 +125,7 @@ extern int gpgpu_cflog_interval; extern unsigned int gpu_stall_by_MSHRwb; extern unsigned int gpu_stall_shd_mem; extern unsigned int gpu_stall_sh2icnt; +extern int gpgpu_operand_collector; enum mem_stage_access_type { C_MEM, @@ -520,7 +521,7 @@ inst_t create_nop_inst() // just because C++ does not have designated initialize nop_inst.id_cycle = 0; nop_inst.ex_cycle = 0; nop_inst.mm_cycle = 0; - nop_inst.space = 0; + nop_inst.space = memory_space_t(); return nop_inst; } @@ -634,7 +635,6 @@ shader_core_ctx_t* shader_create( const char *name, int sid, } } } - sc->last_cta_finished = 0; sc->n_threads = n_threads; sc->thread = (thread_ctx_t*) calloc(sizeof(thread_ctx_t), n_threads); sc->not_completed = 0; |
