Merge branch 'dev' into fix_different_latencies_to_same_ex_unit

1 files changed, 0 insertions, 70 deletions

diff --git a/src/gpuwattch/cacti/subarray.h b/src/gpuwattch/cacti/subarray.h
deleted file mode 100755
index 5fb0624..0000000
--- a/src/gpuwattch/cacti/subarray.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- *                                McPAT/CACTI
- *                      SOFTWARE LICENSE AGREEMENT
- *            Copyright 2012 Hewlett-Packard Development Company, L.P.
- *                          All Rights Reserved
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 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 list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders 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 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
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.”
- *
- ***************************************************************************/
-
-
-
-#ifndef __SUBARRAY_H__
-#define __SUBARRAY_H__
-
-#include "area.h"
-#include "component.h"
-#include "parameter.h"
-
-using namespace std;
-
-
-class Subarray : public Component
-{
-  public:
-    Subarray(const DynamicParameter & dp, bool is_fa_);
-    ~Subarray();
-
-    const DynamicParameter & dp;
-    double  get_total_cell_area();
-    unsigned int num_rows;
-    unsigned int num_cols;
-    int32_t num_cols_fa_cam;
-    int32_t num_cols_fa_ram;
-    Area    cell, cam_cell;
-
-    bool    is_fa;
-    double  C_wl, C_wl_cam, C_wl_ram;
-    double  R_wl, R_wl_cam, R_wl_ram;
-    double  C_bl, C_bl_cam;
-  private:
-
-    void compute_C();  // compute bitline and wordline capacitance
-};
-
-
-
-#endif
-