Revert "Add src/gpgpu-sim formatting"

This reverts commit 9c9b1341613e767f306b2b73b5b8a5317b6ee563.

1 files changed, 29 insertions, 38 deletions

diff --git a/src/gpgpu-sim/l2cache_trace.h b/src/gpgpu-sim/l2cache_trace.h
index e6b623d..d2dd948 100644
--- a/src/gpgpu-sim/l2cache_trace.h
+++ b/src/gpgpu-sim/l2cache_trace.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2011, Tor M. Aamodt, Tim Rogers, Wilson W. L. Fung
+// Copyright (c) 2009-2011, Tor M. Aamodt, Tim Rogers, Wilson W. L. Fung 
 // The University of British Columbia
 // All rights reserved.
 //
@@ -7,16 +7,14 @@
 //
 // Redistributions of source code must retain the above copyright notice, this
 // list of conditions and the following disclaimer.
-// Redistributions in binary form must reproduce the above copyright notice,
-// this
+// Redistributions in binary form must reproduce the above copyright notice, this
 // list of conditions and the following disclaimer in the documentation and/or
 // other materials provided with the distribution.
 // Neither the name of The University of British Columbia nor the names of its
 // contributors may be used to endorse or promote products derived from this
 // software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 // ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -27,54 +25,47 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#pragma once
+#pragma once 
 
 #include "../trace.h"
 
 #if TRACING_ON
 
 #define MEMPART_PRINT_STR SIM_PRINT_STR " %d - "
-#define MEMPART_DTRACE(x)                                  \
-  (DTRACE(x) && (Trace::sampling_memory_partition == -1 || \
-                 Trace::sampling_memory_partition == (int)get_mpid()))
+#define MEMPART_DTRACE(x)  ( DTRACE(x) && (Trace::sampling_memory_partition == -1 || Trace::sampling_memory_partition == (int)get_mpid()) )
 
 #define MEM_SUBPART_PRINT_STR SIM_PRINT_STR " %d - "
-#define MEM_SUBPART_DTRACE(x)                              \
-  (DTRACE(x) && (Trace::sampling_memory_partition == -1 || \
-                 Trace::sampling_memory_partition == (int)m_id))
+#define MEM_SUBPART_DTRACE(x)  ( DTRACE(x) && (Trace::sampling_memory_partition == -1 || Trace::sampling_memory_partition == (int)m_id) )
 
 // Intended to be called from inside components of a memory partition
 // Depends on a get_mpid() function
-#define MEMPART_DPRINTF(...)                                                   \
-  do {                                                                         \
-    if (MEMPART_DTRACE(MEMORY_PARTITION_UNIT)) {                               \
-      printf(                                                                  \
-          MEMPART_PRINT_STR, m_gpu->gpu_sim_cycle + m_gpu->gpu_tot_sim_cycle,  \
-          Trace::trace_streams_str[Trace::MEMORY_PARTITION_UNIT], get_mpid()); \
-      printf(__VA_ARGS__);                                                     \
-    }                                                                          \
-  } while (0)
+#define MEMPART_DPRINTF(...) do {\
+    if (MEMPART_DTRACE(MEMORY_PARTITION_UNIT)) {\
+        printf( MEMPART_PRINT_STR,\
+                m_gpu->gpu_sim_cycle + m_gpu->gpu_tot_sim_cycle,\
+                Trace::trace_streams_str[Trace::MEMORY_PARTITION_UNIT],\
+                get_mpid() );\
+        printf(__VA_ARGS__);\
+    }\
+} while (0)
 
-#define MEM_SUBPART_DPRINTF(...)                                               \
-  do {                                                                         \
-    if (MEM_SUBPART_DTRACE(MEMORY_PARTITION_UNIT)) {                           \
-      printf(MEM_SUBPART_PRINT_STR,                                            \
-             m_gpu->gpu_sim_cycle + m_gpu->gpu_tot_sim_cycle,                  \
-             Trace::trace_streams_str[Trace::MEMORY_SUBPARTITION_UNIT], m_id); \
-      printf(__VA_ARGS__);                                                     \
-    }                                                                          \
-  } while (0)
+#define MEM_SUBPART_DPRINTF(...) do {\
+    if (MEM_SUBPART_DTRACE(MEMORY_PARTITION_UNIT)) {\
+        printf( MEM_SUBPART_PRINT_STR,\
+                m_gpu->gpu_sim_cycle + m_gpu->gpu_tot_sim_cycle,\
+                Trace::trace_streams_str[Trace::MEMORY_SUBPARTITION_UNIT],\
+                m_id );\
+        printf(__VA_ARGS__);\
+    }\
+} while (0)
 
 #else
 
-#define MEMPART_DTRACE(x) (false)
-#define MEMPART_DPRINTF(x, ...) \
-  do {                          \
-  } while (0)
+#define MEMPART_DTRACE(x)  (false)
+#define MEMPART_DPRINTF(x, ...) do {} while (0)
 
-#define MEM_SUBPART_DTRACE(x) (false)
-#define MEM_SUBPART_DPRINTF(x, ...) \
-  do {                              \
-  } while (0)
+#define MEM_SUBPART_DTRACE(x)  (false)
+#define MEM_SUBPART_DPRINTF(x, ...) do {} while (0)
 
 #endif
+