From 9b1e6dba9f721c772e801abc4851a88aa61929da Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 13 Sep 2019 07:48:08 -0400 Subject: Revert "Add src/gpgpu-sim formatting" This reverts commit 9c9b1341613e767f306b2b73b5b8a5317b6ee563. --- src/gpgpu-sim/addrdec.h | 105 ++++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 49 deletions(-) (limited to 'src/gpgpu-sim/addrdec.h') diff --git a/src/gpgpu-sim/addrdec.h b/src/gpgpu-sim/addrdec.h index 0919942..c9a1420 100644 --- a/src/gpgpu-sim/addrdec.h +++ b/src/gpgpu-sim/addrdec.h @@ -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,9 +25,9 @@ // 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. -#include #include #include +#include #include "../option_parser.h" #ifndef ADDRDEC_H @@ -37,57 +35,66 @@ #include "../abstract_hardware_model.h" -enum partition_index_function { - CONSECUTIVE = 0, - BITWISE_PERMUTATION, - IPOLY, - PAE, - RANDOM, - CUSTOM +enum partition_index_function{ + CONSECUTIVE = 0, + BITWISE_PERMUTATION, + IPOLY, + PAE, + RANDOM, + CUSTOM }; struct addrdec_t { - void print(FILE *fp) const; - - unsigned chip; - unsigned bk; - unsigned row; - unsigned col; - unsigned burst; + void print( FILE *fp ) const; + + unsigned chip; + unsigned bk; + unsigned row; + unsigned col; + unsigned burst; - unsigned sub_partition; + unsigned sub_partition; }; + class linear_to_raw_address_translation { - public: - linear_to_raw_address_translation(); - void addrdec_setoption(option_parser_t opp); - void init(unsigned int n_channel, unsigned int n_sub_partition_in_channel); - - // accessors - void addrdec_tlx(new_addr_type addr, addrdec_t *tlx) const; - new_addr_type partition_address(new_addr_type addr) const; - - private: - void addrdec_parseoption(const char *option); - void sweep_test() const; // sanity check to ensure no overlapping - - enum { CHIP = 0, BK = 1, ROW = 2, COL = 3, BURST = 4, N_ADDRDEC }; - - const char *addrdec_option; - int gpgpu_mem_address_mask; - partition_index_function memory_partition_indexing; - bool run_test; - - int ADDR_CHIP_S; - unsigned char addrdec_mklow[N_ADDRDEC]; - unsigned char addrdec_mkhigh[N_ADDRDEC]; - new_addr_type addrdec_mask[N_ADDRDEC]; - new_addr_type sub_partition_id_mask; - - unsigned int gap; - unsigned m_n_channel; - int m_n_sub_partition_in_channel; +public: + linear_to_raw_address_translation(); + void addrdec_setoption(option_parser_t opp); + void init(unsigned int n_channel, unsigned int n_sub_partition_in_channel); + + // accessors + void addrdec_tlx(new_addr_type addr, addrdec_t *tlx) const; + new_addr_type partition_address( new_addr_type addr ) const; + +private: + void addrdec_parseoption(const char *option); + void sweep_test() const; // sanity check to ensure no overlapping + + enum { + CHIP = 0, + BK = 1, + ROW = 2, + COL = 3, + BURST = 4, + N_ADDRDEC + }; + + const char *addrdec_option; + int gpgpu_mem_address_mask; + partition_index_function memory_partition_indexing; + bool run_test; + + int ADDR_CHIP_S; + unsigned char addrdec_mklow[N_ADDRDEC]; + unsigned char addrdec_mkhigh[N_ADDRDEC]; + new_addr_type addrdec_mask[N_ADDRDEC]; + new_addr_type sub_partition_id_mask; + + unsigned int gap; + unsigned m_n_channel; + int m_n_sub_partition_in_channel; + }; #endif -- cgit v1.3