- integrate changes from fermi-test (CL's under that path in range 7261-7418).

(add scoreboard logic from ptxplus branch and modified operand collector
with parallel ALU/SFU pipelines)

passing regressions

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7419]

1 files changed, 6 insertions, 2 deletions

diff --git a/src/cuda-sim/cuda-sim.h b/src/cuda-sim/cuda-sim.h
index baf3b63..6f931fc 100644
--- a/src/cuda-sim/cuda-sim.h
+++ b/src/cuda-sim/cuda-sim.h
@@ -89,11 +89,15 @@ void ptx_decode_inst( void *thd,
                       int *o4, 
                       int *vectorin, 
                       int *vectorout, 
-                      int *arch_reg );
+                      int *arch_reg, 
+                      int *pred,
+                      int *ar1, 
+                      int *ar2 );
 void ptx_exec_inst( void *thd, 
                     address_type *addr, 
                     memory_space_t *space, 
-                    unsigned *data_size, 
+                    unsigned *data_size,
+                    unsigned *cycles, 
                     dram_callback_t* callback, 
                     unsigned warp_active_mask );