Ignore:
Timestamp:
Aug 8, 2007, 9:16:10 PM (17 years ago)
Author:
rosiere
Message:

Modification des Makefile : pas de creation inutile de shell

Location:
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h
    33
    44/*
    … …  
    1212#include "Behavioural/include/Parameters.h"
    1313// Internal structure
    14 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    15 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     14#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     15#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
    1717#include <math.h>
    1818
    1919namespace morpheo {
    2020namespace behavioural {
    21 namespace stage_1_ifetch {
    22 namespace predictor {
     21namespace core {
     22namespace multi_front_end {
     23namespace front_end {
     24namespace prediction_unit {
     25namespace direction {
     26
    2327namespace meta_predictor {
    2428namespace two_level_branch_predictor {
    … …  
    4246  public : const uint32_t _pht_size_address  ;
    4347
    44   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters * _param_branch_history_table;
    45   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters * _param_pattern_history_table;
    46   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters * _param_two_level_branch_predictor_glue;
     48  public :       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters * _param_branch_history_table;
     49  public :       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters * _param_pattern_history_table;
     50  public :       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters * _param_two_level_branch_predictor_glue;
    4751
    4852    //-----[ methods ]-----------------------------------------------------------
    … …  
    6569  public :        string   print      (uint32_t depth);
    6670  public : friend ostream& operator<< (ostream& output_stream,
    67                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters & x);
     71                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x);
    6872  };
    6973
    7074}; // end namespace two_level_branch_predictor
    7175}; // end namespace meta_predictor
    72 }; // end namespace predictor
    73 }; // end namespace stage_1_ifetch
     76
     77}; // end namespace core
     78}; // end namespace multi_front_end
     79}; // end namespace front_end
     80}; // end namespace prediction_unit
     81}; // end namespace direction
     82
    7483}; // end namespace behavioural
    7584}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Statistics_h
    44
    55/*
    … …  
    1212#include "Common/include/Debug.h"
    1313// Internal structure
    14 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    15 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     14#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     15#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
    1717#include "Behavioural/include/Statistics.h"
    1818#include "Behavioural/include/Parameters_Statistics.h"
    1919//#include "Behavioural/Generic/Group/include/Statistics.h"
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     20#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    2121
    2222//using namespace morpheo::behavioural::generic::group;
    … …  
    2424namespace morpheo                    {
    2525namespace behavioural {
    26 namespace stage_1_ifetch {
    27 namespace predictor {
     26namespace core {
     27namespace multi_front_end {
     28namespace front_end {
     29namespace prediction_unit {
     30namespace direction {
     31
    2832namespace meta_predictor {
    2933namespace two_level_branch_predictor {
    … …  
    5761}; // end namespace two_level_branch_predictor
    5862}; // end namespace meta_predictor
    59 }; // end namespace predictor
    60 }; // end namespace stage_1_ifetch
     63
     64}; // end namespace core
     65}; // end namespace multi_front_end
     66}; // end namespace front_end
     67}; // end namespace prediction_unit
     68}; // end namespace direction
     69
    6170
    6271}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
    33
    44/*
    … …  
    1818
    1919// Internal structure
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
    21 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     20#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     21#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     22#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
    2323
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    25 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     25#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
    2626#ifdef STATISTICS
    27 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     27#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    2828#endif
    2929#ifdef VHDL
    … …  
    3636namespace morpheo {
    3737namespace behavioural {
    38 namespace stage_1_ifetch {
    39 namespace predictor {
     38namespace core {
     39namespace multi_front_end {
     40namespace front_end {
     41namespace prediction_unit {
     42namespace direction {
     43
    4044namespace meta_predictor {
    4145namespace two_level_branch_predictor {
    … …  
    98102
    99103    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    100   protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table  * component_Branch_History_Table;
    101   protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Pattern_History_Table * component_Pattern_History_Table;
    102   protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue * component_Two_Level_Branch_Predictor_Glue;
     104  protected : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table  * component_Branch_History_Table;
     105  protected : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Pattern_History_Table * component_Pattern_History_Table;
     106  protected : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue * component_Two_Level_Branch_Predictor_Glue;
    103107
    104108    // -----[ methods ]---------------------------------------------------
    … …  
    145149}; // end namespace two_level_branch_predictor
    146150}; // end namespace meta_predictor
    147 }; // end namespace predictor
    148 }; // end namespace stage_1_ifetch
     151
     152}; // end namespace core
     153}; // end namespace multi_front_end
     154}; // end namespace front_end
     155}; // end namespace prediction_unit
     156}; // end namespace direction
     157
    149158
    150159}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Type_h
    44
    55/*
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2529}; // end namespace two_level_branch_predictor
    2630}; // end namespace meta_predictor
    27 }; // end namespace predictor
    28 }; // end namespace stage_1_ifetch
     31
     32}; // end namespace core
     33}; // end namespace multi_front_end
     34}; // end namespace front_end
     35}; // end namespace prediction_unit
     36}; // end namespace direction
     37
    2938}; // end namespace behavioural
    3039}; // end namespace morpheo             
Note: See TracChangeset for help on using the changeset viewer.