Merge pull request #313 from accel-sim/dev

Purdue Updates Merging

1 files changed, 18 insertions, 14 deletions

diff --git a/src/gpgpu-sim/power_interface.h b/src/gpgpu-sim/power_interface.h
index 1a48894..3c043e6 100644
--- a/src/gpgpu-sim/power_interface.h
+++ b/src/gpgpu-sim/power_interface.h
@@ -1,16 +1,18 @@
-// Copyright (c) 2009-2021, Tor M. Aamodt, Ahmed El-Shafiey, Tayler Hetherington, Vijay Kandiah, Nikos Hardavellas
-// The University of British Columbia, Northwestern University
-// All rights reserved.
+// Copyright (c) 2009-2021, Tor M. Aamodt, Ahmed El-Shafiey, Tayler
+// Hetherington, Vijay Kandiah, Nikos Hardavellas, Mahmoud Khairy, Junrui Pan,
+// Timothy G. Rogers The University of British Columbia, Northwestern
+// University, Purdue University All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
 //
-// 1. Redistributions of source code must retain the above copyright notice, this
+// 1. Redistributions of source code must retain the above copyright notice,
+// this
 //    list of conditions and the following disclaimer;
 // 2. 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;
-// 3. Neither the names of The University of British Columbia, Northwestern 
+// 3. Neither the names of The University of British Columbia, Northwestern
 //    University nor the names of their contributors may be used to
 //    endorse or promote products derived from this software without specific
 //    prior written permission.
@@ -46,16 +48,18 @@ void mcpat_cycle(const gpgpu_sim_config &config,
                  unsigned tot_cycle, unsigned cycle, unsigned tot_inst,
                  unsigned inst, bool dvfs_enabled);
 
-void calculate_hw_mcpat(const gpgpu_sim_config &config,
-                 const shader_core_config *shdr_config,
-                 class gpgpu_sim_wrapper *wrapper,
-                 class power_stat_t *power_stats, unsigned stat_sample_freq,
-                 unsigned tot_cycle, unsigned cycle, unsigned tot_inst,
-                 unsigned inst, int power_simulation_mode, bool dvfs_enabled, 
-                 char* hwpowerfile, char* benchname, std::string executed_kernelname, 
-                 const bool *accelwattch_hybrid_configuration, bool aggregate_power_stats);
+void calculate_hw_mcpat(
+    const gpgpu_sim_config &config, const shader_core_config *shdr_config,
+    class gpgpu_sim_wrapper *wrapper, class power_stat_t *power_stats,
+    unsigned stat_sample_freq, unsigned tot_cycle, unsigned cycle,
+    unsigned tot_inst, unsigned inst, int power_simulation_mode,
+    bool dvfs_enabled, char *hwpowerfile, char *benchname,
+    std::string executed_kernelname,
+    const bool *accelwattch_hybrid_configuration, bool aggregate_power_stats);
 
-bool parse_hw_file(char* hwpowerfile, bool find_target_kernel, vector<string> &hw_data, char* benchname, std::string executed_kernelname);
+bool parse_hw_file(char *hwpowerfile, bool find_target_kernel,
+                   vector<string> &hw_data, char *benchname,
+                   std::string executed_kernelname);
 
 void mcpat_reset_perf_count(class gpgpu_sim_wrapper *wrapper);