Integration change. mem_divergence 10699 which uses a tuple file for this explicit string/enum dependency. Removes a bug when doing debug priting caused by walking off the end of the named list because someone forgot to update the string array

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

1 files changed, 7 insertions, 27 deletions

diff --git a/src/gpgpu-sim/mem_fetch.h b/src/gpgpu-sim/mem_fetch.h
index cc3147c..a4e8499 100644
--- a/src/gpgpu-sim/mem_fetch.h
+++ b/src/gpgpu-sim/mem_fetch.h
@@ -39,33 +39,13 @@ enum mf_type {
    WRITE_ACK
 };
 
-enum mem_fetch_status {
-    MEM_FETCH_INITIALIZED = 0,
-    IN_L1I_MISS_QUEUE,
-    IN_L1D_MISS_QUEUE,
-    IN_L1T_MISS_QUEUE,
-    IN_L1C_MISS_QUEUE,
-    IN_ICNT_TO_MEM,
-    IN_PARTITION_ROP_DELAY,
-    IN_PARTITION_ICNT_TO_L2_QUEUE,
-    IN_PARTITION_L2_TO_DRAM_QUEUE,
-    IN_PARTITION_L2_MISS_QUEUE,
-    IN_PARTITION_MC_INTERFACE_QUEUE,
-    IN_PARTITION_MC_INPUT_QUEUE,
-    IN_PARTITION_MC_BANK_ARB_QUEUE,
-    IN_PARTITION_DRAM,
-    IN_PARTITION_MC_RETURNQ,
-    IN_PARTITION_DRAM_TO_L2_QUEUE,
-    IN_PARTITION_L2_FILL_QUEUE,
-    IN_PARTITION_L2_TO_ICNT_QUEUE,
-    IN_ICNT_TO_SHADER,
-    IN_CLUSTER_TO_SHADER_QUEUE,
-    IN_SHADER_LDST_RESPONSE_FIFO,
-    IN_SHADER_FETCHED,
-    IN_SHADER_L1T_ROB,
-    MEM_FETCH_DELETED,
-    NUM_MEM_REQ_STAT
-};
+#define MF_TUP_BEGIN(X) enum X {
+#define MF_TUP(X) X
+#define MF_TUP_END(X) };
+#include "mem_fetch_status.tup"
+#undef MF_TUP_BEGIN
+#undef MF_TUP
+#undef MF_TUP_END
 
 class mem_fetch {
 public: