From 80e1b49ff823190d0316623d414a343575c93eae Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sun, 29 Aug 2010 14:55:25 -0800 Subject: - 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] --- src/abstract_hardware_model.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/abstract_hardware_model.h') diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h index 612c46d..9762674 100644 --- a/src/abstract_hardware_model.h +++ b/src/abstract_hardware_model.h @@ -26,11 +26,12 @@ typedef unsigned addr_t; // these are operations the timing model can see #define NO_OP -1 -#define ALU_OP 1000 -#define LOAD_OP 2000 -#define STORE_OP 3000 -#define BRANCH_OP 4000 -#define BARRIER_OP 5000 +#define ALU_OP 0x01000 +#define SFU_OP 0x02000 +#define LOAD_OP 0x04000 +#define STORE_OP 0x08000 +#define BRANCH_OP 0x10000 +#define BARRIER_OP 0x20000 enum _memory_space_t { undefined_space=0, -- cgit v1.3