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
Files:
114 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/Branch_History_Table/Makefile.defs

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps

    r15 r48  
    2626                                                $(Behavioural_LIBRARY) 
    2727
    28 Branch_History_Table_DIR_LIBRARY        =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/lib        \
     28Branch_History_Table_DIR_LIBRARY        =       -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/lib        \
    2929                                                $(RegisterFile_Monolithic_DIR_LIBRARY)  \
    3030                                                $(Shifter_DIR_LIBRARY)          \
    … …  
    3434
    3535Branch_History_Table_library            :
    36                                         @$(MAKE) Behavioural_library
    37                                         @$(MAKE) Shifter_library
    38                                         @$(MAKE) RegisterFile_Monolithic_library
    39                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile
     36                                        @\
     37                                        $(MAKE) Behavioural_library;\
     38                                        $(MAKE) Shifter_library;\
     39                                        $(MAKE) RegisterFile_Monolithic_library;\
     40                                        $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile;
    4041
    4142Branch_History_Table_library_clean      :
    42                                         @$(MAKE) Behavioural_library_clean
    43                                         @$(MAKE) Shifter_library_clean
    44                                         @$(MAKE) RegisterFile_Monolithic_library_clean
    45                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile clean
     43                                        @\
     44                                        $(MAKE) Behavioural_library_clean;\
     45                                        $(MAKE) Shifter_library_clean;\
     46                                        $(MAKE) RegisterFile_Monolithic_library_clean;\
     47                                        $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../../..
    1111
    1212LIBRARY                         = $(Branch_History_Table_LIBRARY)

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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     16#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"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    24 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
    2521
    26 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
     25
     26using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table;
    2727
    2828void test   (string name,
    29              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param);
     29             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/main.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
    1010
    1111#define NB_PARAMS 4
    … …  
    3737  const uint32_t nb_branch_complete = atoi(argv[5]);
    3838
    39   morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param (size_shifter       ,
     39  morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param (size_shifter       ,
    4040                                                                                                                                       nb_shifter         ,
    4141                                                                                                                                       nb_prediction      ,

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/test.cpp

    r45 r48  
    99#define NB_ITERATION 1024
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
    1212#include "Common/include/BitManipulation.h"
    1313#include "Common/include/Test.h"
    1414
    1515void test (string name,
    16            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param)
     16           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param)
    1717{
    1818  cout << "<" << name << "> : Simulation SystemC" << endl;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/doc/Branch_History_Table.tex

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h
    33
    44/*
    … …  
    1919#include "Behavioural/Generic/Shifter/include/Shifter.h"
    2020#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h"
    21 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
     21#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     22#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
    2323#ifdef STATISTICS
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    2525#endif
    2626#ifdef VHDL
    … …  
    3333namespace morpheo {
    3434namespace behavioural {
    35 namespace stage_1_ifetch {
    36 namespace predictor {
     35namespace core {
     36namespace multi_front_end {
     37namespace front_end {
     38namespace prediction_unit {
     39namespace direction {
     40
    3741namespace meta_predictor {
    3842namespace two_level_branch_predictor {
    … …  
    130134}; // end namespace two_level_branch_predictor
    131135}; // end namespace meta_predictor
    132 }; // end namespace predictor
    133 }; // end namespace stage_1_ifetch
     136
     137}; // end namespace core
     138}; // end namespace multi_front_end
     139}; // end namespace front_end
     140}; // end namespace prediction_unit
     141}; // end namespace direction
     142
    134143
    135144}; // end namespace behavioural

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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
    33
    44/*
    … …  
    1818namespace morpheo {
    1919namespace behavioural {
    20 namespace stage_1_ifetch {
    21 namespace predictor {
     20namespace core {
     21namespace multi_front_end {
     22namespace front_end {
     23namespace prediction_unit {
     24namespace direction {
     25
    2226namespace meta_predictor {
    2327namespace two_level_branch_predictor {
    … …  
    4852  public :        string   print      (uint32_t depth);
    4953  public : friend ostream& operator<< (ostream& output_stream,
    50                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x);
     54                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x);
    5155  };
    5256
    … …  
    5458}; // end namespace two_level_branch_predictor
    5559}; // end namespace meta_predictor
    56 }; // end namespace predictor
    57 }; // end namespace stage_1_ifetch
     60
     61}; // end namespace core
     62}; // end namespace multi_front_end
     63}; // end namespace front_end
     64}; // end namespace prediction_unit
     65}; // end namespace direction
     66
    5867}; // end namespace behavioural
    5968}; // end namespace morpheo             

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

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
    44
    55/*
    … …  
    1616#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Statistics.h"
    1717//#include "Behavioural/Generic/Group/include/Statistics.h"
    18 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     18#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    1919
    2020//using namespace morpheo::behavioural::generic::group;
    … …  
    2222namespace morpheo                    {
    2323namespace behavioural {
    24 namespace stage_1_ifetch {
    25 namespace predictor {
     24namespace core {
     25namespace multi_front_end {
     26namespace front_end {
     27namespace prediction_unit {
     28namespace direction {
     29
    2630namespace meta_predictor {
    2731namespace two_level_branch_predictor {
    … …  
    5660}; // end namespace two_level_branch_predictor
    5761}; // end namespace meta_predictor
    58 }; // end namespace predictor
    59 }; // end namespace stage_1_ifetch
     62
     63}; // end namespace core
     64}; // end namespace multi_front_end
     65}; // end namespace front_end
     66}; // end namespace prediction_unit
     67}; // end namespace direction
     68
    6069
    6170}; // end namespace behavioural

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

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_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 {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039}; // end namespace behavioural
    3140}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table.cpp

    r42 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     8#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"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2529                                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2630#endif
    27                                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param ):
     31                                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param ):
    2832                                               _name             (name)
    2933                                              ,_param            (param)
    … …  
    8791}; // end namespace two_level_branch_predictor
    8892}; // end namespace meta_predictor
    89 }; // end namespace predictor
    90 }; // end namespace stage_1_ifetch
     93
     94}; // end namespace core
     95}; // end namespace multi_front_end
     96}; // end namespace front_end
     97}; // end namespace prediction_unit
     98}; // end namespace direction
     99
    91100
    92101}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_allocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    206210}; // end namespace two_level_branch_predictor
    207211}; // end namespace meta_predictor
    208 }; // end namespace predictor
    209 }; // end namespace stage_1_ifetch
     212
     213}; // end namespace core
     214}; // end namespace multi_front_end
     215}; // end namespace front_end
     216}; // end namespace prediction_unit
     217}; // end namespace direction
     218
    210219}; // end namespace behavioural
    211220}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_deallocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    4347}; // end namespace two_level_branch_predictor
    4448}; // end namespace meta_predictor
    45 }; // end namespace predictor
    46 }; // end namespace stage_1_ifetch
     49
     50}; // end namespace core
     51}; // end namespace multi_front_end
     52}; // end namespace front_end
     53}; // end namespace prediction_unit
     54}; // end namespace direction
     55
    4756}; // end namespace behavioural
    4857}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2933}; // end namespace two_level_branch_predictor
    3034}; // end namespace meta_predictor
    31 }; // end namespace predictor
    32 }; // end namespace stage_1_ifetch
     35
     36}; // end namespace core
     37}; // end namespace multi_front_end
     38}; // end namespace front_end
     39}; // end namespace prediction_unit
     40}; // end namespace direction
     41
    3342
    3443}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_transition.cpp

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     10#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"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3337}; // end namespace two_level_branch_predictor
    3438}; // end namespace meta_predictor
    35 }; // end namespace predictor
    36 }; // end namespace stage_1_ifetch
     39
     40}; // end namespace core
     41}; // end namespace multi_front_end
     42}; // end namespace front_end
     43}; // end namespace prediction_unit
     44}; // end namespace direction
     45
    3746
    3847}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl.cpp

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_body.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace 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
    3039}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_declaration.cpp

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2428}; // end namespace two_level_branch_predictor
    2529}; // end namespace meta_predictor
    26 }; // end namespace predictor
    27 }; // end namespace stage_1_ifetch
     30
     31}; // end namespace core
     32}; // end namespace multi_front_end
     33}; // end namespace front_end
     34}; // end namespace prediction_unit
     35}; // end namespace direction
     36
    2837}; // end namespace behavioural
    2938}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_testbench_transition.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters.cpp

    r15 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    7377}; // end namespace two_level_branch_predictor
    7478}; // end namespace meta_predictor
    75 }; // end namespace predictor
    76 }; // end namespace stage_1_ifetch
     79
     80}; // end namespace core
     81}; // end namespace multi_front_end
     82}; // end namespace front_end
     83}; // end namespace prediction_unit
     84}; // end namespace direction
     85
    7786}; // end namespace behavioural
    7887}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_msg_error.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261
    5362}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_print.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3640
    3741  ostream& operator<< (ostream& output_stream ,
    38                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x)
     42                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x)
    3943  {
    4044    output_stream << x.print(0);
    … …  
    4650}; // end namespace two_level_branch_predictor
    4751}; // end namespace meta_predictor
    48 }; // end namespace predictor
    49 }; // end namespace stage_1_ifetch
     52
     53}; // end namespace core
     54}; // end namespace multi_front_end
     55}; // end namespace front_end
     56}; // end namespace prediction_unit
     57}; // end namespace direction
     58
    5059
    5160}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_add.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    3943
    4044  ostream& operator<< (ostream& output_stream ,
    41                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Statistics & x)
     45                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Statistics & x)
    4246  {
    4347    output_stream << x.print(0);
    … …  
    4953}; // end namespace two_level_branch_predictor
    5054}; // end namespace meta_predictor
    51 }; // end namespace predictor
    52 }; // end namespace stage_1_ifetch
     55
     56}; // end namespace core
     57}; // end namespace multi_front_end
     58}; // end namespace front_end
     59}; // end namespace prediction_unit
     60}; // end namespace direction
     61
    5362}; // end namespace behavioural
    5463}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print_body.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3337}; // end namespace two_level_branch_predictor
    3438}; // end namespace meta_predictor
    35 }; // end namespace predictor
    36 }; // end namespace stage_1_ifetch
     39
     40}; // end namespace core
     41}; // end namespace multi_front_end
     42}; // end namespace front_end
     43}; // end namespace prediction_unit
     44}; // end namespace direction
     45
    3746
    3847}; // end namespace behavioural

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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

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

    r2 r48  
    1212endif
    1313ifndef Branch_History_Table
    14 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps
     14include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps
    1515endif
    1616ifndef Pattern_History_Table
    17 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps
     17include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps
    1818endif
    1919ifndef Two_Level_Branch_Predictor_Glue
    20 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps
     20include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps
    2121endif
    2222
    … …  
    3030                                                        $(Behavioural_LIBRARY) 
    3131
    32 Two_Level_Branch_Predictor_DIR_LIBRARY          =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/lib     \
     32Two_Level_Branch_Predictor_DIR_LIBRARY          =       -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/lib     \
    3333                                                        $(Two_Level_Branch_Predictor_Glue_DIR_LIBRARY)  \
    3434                                                        $(Branch_History_Table_DIR_LIBRARY)             \
    … …  
    3939
    4040Two_Level_Branch_Predictor_library              :
    41                                                 @$(MAKE) Behavioural_library
    42                                                 @$(MAKE) Branch_History_Table_library
    43                                                 @$(MAKE) Pattern_History_Table_library
    44                                                 @$(MAKE) Two_Level_Branch_Predictor_Glue_library
    45                                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile
     41                                                @\
     42                                                $(MAKE) Behavioural_library;\
     43                                                $(MAKE) Branch_History_Table_library;\
     44                                                $(MAKE) Pattern_History_Table_library;\
     45                                                $(MAKE) Two_Level_Branch_Predictor_Glue_library;\
     46                                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile ;
    4647       
    4748Two_Level_Branch_Predictor_library_clean        :
    48                                                 @$(MAKE) Behavioural_library_clean
    49                                                 @$(MAKE) Branch_History_Table_library_clean
    50                                                 @$(MAKE) Pattern_History_Table_library_clean
    51                                                 @$(MAKE) Two_Level_Branch_Predictor_Glue_library_clean
    52                                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile clean
     49                                                @\
     50                                                $(MAKE) Behavioural_library_clean;\
     51                                                $(MAKE) Branch_History_Table_library_clean;\
     52                                                $(MAKE) Pattern_History_Table_library_clean;\
     53                                                $(MAKE) Two_Level_Branch_Predictor_Glue_library_clean;\
     54                                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.defs

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps

    r15 r48  
    2626                                                $(Behavioural_LIBRARY)
    2727
    28 Pattern_History_Table_DIR_LIBRARY       =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/lib       \
     28Pattern_History_Table_DIR_LIBRARY       =       -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/lib       \
    2929                                                $(RegisterFile_Monolithic_DIR_LIBRARY)  \
    3030                                                $(Counter_DIR_LIBRARY)          \
    … …  
    3434
    3535Pattern_History_Table_library           :
    36                                         @$(MAKE) Behavioural_library
    37                                         @$(MAKE) Counter_library
    38                                         @$(MAKE) RegisterFile_Monolithic_library
    39                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile
     36                                        @\
     37                                        $(MAKE) Behavioural_library;\
     38                                        $(MAKE) Counter_library;\
     39                                        $(MAKE) RegisterFile_Monolithic_library;\
     40                                        $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile;
    4041       
    4142Pattern_History_Table_library_clean     :
    42                                         @$(MAKE) Behavioural_library_clean
    43                                         @$(MAKE) Counter_library_clean
    44                                         @$(MAKE) RegisterFile_Monolithic_library_clean
    45                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile clean
     43                                        @\
     44                                        $(MAKE) Behavioural_library_clean;\
     45                                        $(MAKE) Counter_library_clean;\
     46                                        $(MAKE) RegisterFile_Monolithic_library_clean;\
     47                                        $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../../..
    1111
    1212LIBRARY                         = $(Pattern_History_Table_LIBRARY)

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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     16#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"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    24 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
    2521
    26 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
     25
     26using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table;
    2727
    2828void test   (string name,
    29              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param);
     29             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/main.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
    1010
    1111#define NB_PARAMS 4
    … …  
    3737  const uint32_t nb_branch_complete = atoi(argv[5]);
    3838
    39   morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param (size_counter       ,
     39  morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param (size_counter       ,
    4040                                                                                                                                       nb_counter         ,
    4141                                                                                                                                       nb_prediction      ,

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/test.cpp

    r45 r48  
    99#define NB_ITERATION 512
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
    1212#include "Common/include/Test.h"
    1313
    1414void test (string name,
    15            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param)
     15           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param)
    1616{
    1717  cout << "<" << name << "> : Simulation SystemC" << endl;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/doc/Pattern_History_Table.tex

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
    33
    44/*
    … …  
    1818namespace morpheo {
    1919namespace behavioural {
    20 namespace stage_1_ifetch {
    21 namespace predictor {
     20namespace core {
     21namespace multi_front_end {
     22namespace front_end {
     23namespace prediction_unit {
     24namespace direction {
     25
    2226namespace meta_predictor {
    2327namespace two_level_branch_predictor {
    … …  
    4852  public :        string   print      (uint32_t depth);
    4953  public : friend ostream& operator<< (ostream& output_stream,
    50                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x);
     54                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x);
    5155  };
    5256
    … …  
    5458}; // end namespace two_level_branch_predictor
    5559}; // end namespace meta_predictor
    56 }; // end namespace predictor
    57 }; // end namespace stage_1_ifetch
     60
     61}; // end namespace core
     62}; // end namespace multi_front_end
     63}; // end namespace front_end
     64}; // end namespace prediction_unit
     65}; // end namespace direction
     66
    5867
    5968}; // end namespace behavioural

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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h
    33
    44/*
    … …  
    2121#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h"
    2222
    23 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
     23#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
    2525#ifdef STATISTICS
    26 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     26#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    2727#endif
    2828#ifdef VHDL
    … …  
    3535namespace morpheo                    {
    3636namespace behavioural {
    37 namespace stage_1_ifetch {
    38 namespace predictor {
     37namespace core {
     38namespace multi_front_end {
     39namespace front_end {
     40namespace prediction_unit {
     41namespace direction {
     42
    3943namespace meta_predictor {
    4044namespace two_level_branch_predictor {
    … …  
    135139}; // end namespace two_level_branch_predictor
    136140}; // end namespace meta_predictor
    137 }; // end namespace predictor
    138 }; // end namespace stage_1_ifetch
     141
     142}; // end namespace core
     143}; // end namespace multi_front_end
     144}; // end namespace front_end
     145}; // end namespace prediction_unit
     146}; // end namespace direction
     147
    139148
    140149}; // end namespace behavioural

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

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
    44
    55/*
    … …  
    1616#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Statistics.h"
    1717//#include "Behavioural/Generic/Group/include/Statistics.h"
    18 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     18#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    1919
    2020//using namespace morpheo::behavioural::generic::group;
    … …  
    2222namespace morpheo                    {
    2323namespace behavioural {
    24 namespace stage_1_ifetch {
    25 namespace predictor {
     24namespace core {
     25namespace multi_front_end {
     26namespace front_end {
     27namespace prediction_unit {
     28namespace direction {
     29
    2630namespace meta_predictor {
    2731namespace two_level_branch_predictor {
    … …  
    5660}; // end namespace two_level_branch_predictor
    5761}; // end namespace meta_predictor
    58 }; // end namespace predictor
    59 }; // end namespace stage_1_ifetch
     62
     63}; // end namespace core
     64}; // end namespace multi_front_end
     65}; // end namespace front_end
     66}; // end namespace prediction_unit
     67}; // end namespace direction
     68
    6069
    6170}; // end namespace behavioural

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

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_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 {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039}; // end namespace behavioural
    3140}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters.cpp

    r15 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    7175}; // end namespace two_level_branch_predictor
    7276}; // end namespace meta_predictor
    73 }; // end namespace predictor
    74 }; // end namespace stage_1_ifetch
     77
     78}; // end namespace core
     79}; // end namespace multi_front_end
     80}; // end namespace front_end
     81}; // end namespace prediction_unit
     82}; // end namespace direction
     83
    7584}; // end namespace behavioural
    7685}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_msg_error.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    5256}; // end namespace two_level_branch_predictor
    5357}; // end namespace meta_predictor
    54 }; // end namespace predictor
    55 }; // end namespace stage_1_ifetch
     58
     59}; // end namespace core
     60}; // end namespace multi_front_end
     61}; // end namespace front_end
     62}; // end namespace prediction_unit
     63}; // end namespace direction
     64
    5665
    5766}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_print.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4044
    4145  ostream& operator<< (ostream& output_stream ,
    42                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x)
     46                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x)
    4347  {
    4448    output_stream << x.print(0);
    … …  
    5054}; // end namespace two_level_branch_predictor
    5155}; // end namespace meta_predictor
    52 }; // end namespace predictor
    53 }; // end namespace stage_1_ifetch
     56
     57}; // end namespace core
     58}; // end namespace multi_front_end
     59}; // end namespace front_end
     60}; // end namespace prediction_unit
     61}; // end namespace direction
     62
    5463
    5564}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table.cpp

    r42 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     8#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"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2529                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2630#endif
    27                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param ):
     31                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param ):
    2832                              _name              (name)
    2933                              ,_param            (param)
    … …  
    9195}; // end namespace two_level_branch_predictor
    9296}; // end namespace meta_predictor
    93 }; // end namespace predictor
    94 }; // end namespace stage_1_ifetch
     97
     98}; // end namespace core
     99}; // end namespace multi_front_end
     100}; // end namespace front_end
     101}; // end namespace prediction_unit
     102}; // end namespace direction
     103
    95104
    96105}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_allocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    210214}; // end namespace two_level_branch_predictor
    211215}; // end namespace meta_predictor
    212 }; // end namespace predictor
    213 }; // end namespace stage_1_ifetch
     216
     217}; // end namespace core
     218}; // end namespace multi_front_end
     219}; // end namespace front_end
     220}; // end namespace prediction_unit
     221}; // end namespace direction
     222
    214223
    215224}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_deallocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261
    5362}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948}; // end namespace behavioural
    4049}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_transition.cpp

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     10#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"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl.cpp

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4246}; // end namespace two_level_branch_predictor
    4347}; // end namespace meta_predictor
    44 }; // end namespace predictor
    45 }; // end namespace stage_1_ifetch
     48
     49}; // end namespace core
     50}; // end namespace multi_front_end
     51}; // end namespace front_end
     52}; // end namespace prediction_unit
     53}; // end namespace direction
     54
    4655
    4756}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_body.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_declaration.cpp

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_testbench_transition.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3236}; // end namespace two_level_branch_predictor
    3337}; // end namespace meta_predictor
    34 }; // end namespace predictor
    35 }; // end namespace stage_1_ifetch
     38
     39}; // end namespace core
     40}; // end namespace multi_front_end
     41}; // end namespace front_end
     42}; // end namespace prediction_unit
     43}; // end namespace direction
     44
    3645
    3746}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3943}; // end namespace two_level_branch_predictor
    4044}; // end namespace meta_predictor
    41 }; // end namespace predictor
    42 }; // end namespace stage_1_ifetch
     45
     46}; // end namespace core
     47}; // end namespace multi_front_end
     48}; // end namespace front_end
     49}; // end namespace prediction_unit
     50}; // end namespace direction
     51
    4352
    4453}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_add.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3034}; // end namespace two_level_branch_predictor
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    5256
    5357  ostream& operator<< (ostream& output_stream ,
    54                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Statistics & x)
     58                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Statistics & x)
    5559  {
    5660    output_stream << x.print(0);
    … …  
    6266}; // end namespace two_level_branch_predictor
    6367}; // end namespace meta_predictor
    64 }; // end namespace predictor
    65 }; // end namespace stage_1_ifetch
     68
     69}; // end namespace core
     70}; // end namespace multi_front_end
     71}; // end namespace front_end
     72}; // end namespace prediction_unit
     73}; // end namespace direction
     74
    6675
    6776}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print_body.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../..
    11 
     10DIR_MORPHEO                     = ../../../../../../../../..
    1211LIBRARY                         = $(Two_Level_Branch_Predictor_LIBRARY)
    1312

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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    2421
    25 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24
     25using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
    2626
    2727void test   (string name,
    28              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param);
     28             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
    99
    1010#define NB_PARAMS 10
    … …  
    5353  try
    5454    {
    55       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param (have_bht               ,
     55      morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param (have_bht               ,
    5656                                                                                                                     bht_size_shifter       ,
    5757                                                                                                                     bht_nb_shifter         ,

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp

    r45 r48  
    99#define NB_ITERATION 512
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
    1212#include "Common/include/Test.h"
    1313#include "Common/include/BitManipulation.h"
    1414void test (string name,
    15            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param)
     15           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param)
    1616{
    1717  cout << "<" << name << "> : Simulation SystemC" << endl;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.defs

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps

    r2 r48  
    1818                                        $(Behavioural_LIBRARY) 
    1919
    20 Two_Level_Branch_Predictor_Glue_DIR_LIBRARY             =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/lib     \
     20Two_Level_Branch_Predictor_Glue_DIR_LIBRARY             =       -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/lib     \
    2121                                        $(Behavioural_DIR_LIBRARY)
    2222
    … …  
    2424
    2525Two_Level_Branch_Predictor_Glue_library         :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library;\
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile;
    2829       
    2930Two_Level_Branch_Predictor_Glue_library_clean   :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean;\
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../../..
    1111
    1212LIBRARY                         = $(Two_Level_Branch_Predictor_Glue_LIBRARY)

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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.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/Two_Level_Branch_Predictor_Glue.h"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    24 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
    2521
    26 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
     25
     26using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue;
    2727
    2828void test   (string name,
    29              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param);
     29             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/main.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h"
    99
    1010#define NB_PARAMS 9
    … …  
    4646  const uint32_t nb_branch_complete       = atoi(argv[10]);
    4747
    48   morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param (have_bht              ,
     48  morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param (have_bht              ,
    4949                                                                                                                                                  bht_size_history      ,
    5050                                                                                                                                                  bht_size_address      ,

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/test.cpp

    r45 r48  
    99#define NB_ITERATION 64
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h"
    1212#include "Common/include/BitManipulation.h"
    1313#include "Common/include/Test.h"
    1414
    1515void test (string name,
    16            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param)
     16           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param)
    1717{
    1818  cout << "<" << name << "> : Simulation SystemC" << endl;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/doc/Two_Level_Branch_Predictor_Glue.tex

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h
    33
    44/*
    … …  
    1515namespace morpheo {
    1616namespace behavioural {
    17 namespace stage_1_ifetch {
    18 namespace predictor {
     17namespace core {
     18namespace multi_front_end {
     19namespace front_end {
     20namespace prediction_unit {
     21namespace direction {
     22
    1923namespace meta_predictor {
    2024namespace two_level_branch_predictor {
    … …  
    5458  public :        string   print      (uint32_t depth);
    5559  public : friend ostream& operator<< (ostream& output_stream,
    56                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x);
     60                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x);
    5761  };
    5862
    … …  
    6064}; // end namespace two_level_branch_predictor
    6165}; // end namespace meta_predictor
    62 }; // end namespace predictor
    63 }; // end namespace stage_1_ifetch
     66
     67}; // end namespace core
     68}; // end namespace multi_front_end
     69}; // end namespace front_end
     70}; // end namespace prediction_unit
     71}; // end namespace direction
     72
    6473
    6574}; // end namespace behavioural

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

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h
    44
    55/*
    … …  
    1414#include "Behavioural/include/Parameters_Statistics.h"
    1515//#include "Behavioural/Generic/Group/include/Statistics.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/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
    1818//using namespace morpheo::behavioural::generic::group;
    … …  
    2020namespace morpheo                    {
    2121namespace behavioural {
    22 namespace stage_1_ifetch {
    23 namespace predictor {
     22namespace core {
     23namespace multi_front_end {
     24namespace front_end {
     25namespace prediction_unit {
     26namespace direction {
     27
    2428namespace meta_predictor {
    2529namespace two_level_branch_predictor {
    … …  
    5256}; // end namespace two_level_branch_predictor
    5357}; // end namespace meta_predictor
    54 }; // end namespace predictor
    55 }; // end namespace stage_1_ifetch
     58
     59}; // end namespace core
     60}; // end namespace multi_front_end
     61}; // end namespace front_end
     62}; // end namespace prediction_unit
     63}; // end namespace direction
     64
    5665
    5766}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h
     1#ifndef 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_h
     2#define 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_h
    33
    44/*
    … …  
    1717#include "Common/include/Debug.h"
    1818
    19 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h"
     19#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"
     20#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h"
    2121#ifdef STATISTICS
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.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/Statistics.h"
    2323#endif
    2424#ifdef VHDL
    … …  
    3131namespace morpheo {
    3232namespace behavioural {
    33 namespace stage_1_ifetch {
    34 namespace predictor {
     33namespace core {
     34namespace multi_front_end {
     35namespace front_end {
     36namespace prediction_unit {
     37namespace direction {
     38
    3539namespace meta_predictor {
    3640namespace two_level_branch_predictor {
    … …  
    140144}; // end namespace two_level_branch_predictor
    141145}; // end namespace meta_predictor
    142 }; // end namespace predictor
    143 }; // end namespace stage_1_ifetch
     146
     147}; // end namespace core
     148}; // end namespace multi_front_end
     149}; // end namespace front_end
     150}; // end namespace prediction_unit
     151}; // end namespace direction
     152
    144153
    145154}; // end namespace behavioural

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

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_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 {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039
    3140}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     8#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"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    6872}; // end namespace two_level_branch_predictor
    6973}; // end namespace meta_predictor
    70 }; // end namespace predictor
    71 }; // end namespace stage_1_ifetch
     74
     75}; // end namespace core
     76}; // end namespace multi_front_end
     77}; // end namespace front_end
     78}; // end namespace prediction_unit
     79}; // end namespace direction
     80
    7281}; // end namespace behavioural
    7382}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_msg_error.cpp

    r45 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h"
     8#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"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    4751}; // end namespace two_level_branch_predictor
    4852}; // end namespace meta_predictor
    49 }; // end namespace predictor
    50 }; // end namespace stage_1_ifetch
     53
     54}; // end namespace core
     55}; // end namespace multi_front_end
     56}; // end namespace front_end
     57}; // end namespace prediction_unit
     58}; // end namespace direction
     59
    5160}; // end namespace behavioural
    5261}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_print.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     8#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"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4347
    4448  ostream& operator<< (ostream& output_stream ,
    45                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x)
     49                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x)
    4650  {
    4751    output_stream << x.print(0);
    … …  
    5357}; // end namespace two_level_branch_predictor
    5458}; // end namespace meta_predictor
    55 }; // end namespace predictor
    56 }; // end namespace stage_1_ifetch
     59
     60}; // end namespace core
     61}; // end namespace multi_front_end
     62}; // end namespace front_end
     63}; // end namespace prediction_unit
     64}; // end namespace direction
     65
    5766
    5867}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3943}; // end namespace two_level_branch_predictor
    4044}; // end namespace meta_predictor
    41 }; // end namespace predictor
    42 }; // end namespace stage_1_ifetch
     45
     46}; // end namespace core
     47}; // end namespace multi_front_end
     48}; // end namespace front_end
     49}; // end namespace prediction_unit
     50}; // end namespace direction
     51
    4352
    4453}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_add.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3034}; // end namespace two_level_branch_predictor
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3842
    3943  ostream& operator<< (ostream& output_stream ,
    40                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Statistics & x)
     44                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Statistics & x)
    4145  {
    4246    output_stream << x.print(0);
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261
    5362}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print_body.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue.cpp

    r45 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     8#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"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2529                                                                    morpheo::behavioural::Parameters_Statistics             param_statistics,
    2630#endif
    27                                                                     morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param ):
     31                                                                    morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param ):
    2832                                                                    _name              (name)
    2933                                                                    ,_param            (param)
    … …  
    199203}; // end namespace two_level_branch_predictor
    200204}; // end namespace meta_predictor
    201 }; // end namespace predictor
    202 }; // end namespace stage_1_ifetch
     205
     206}; // end namespace core
     207}; // end namespace multi_front_end
     208}; // end namespace front_end
     209}; // end namespace prediction_unit
     210}; // end namespace direction
     211
    203212
    204213}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_allocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    147151}; // end namespace two_level_branch_predictor
    148152}; // end namespace meta_predictor
    149 }; // end namespace predictor
    150 }; // end namespace stage_1_ifetch
     153
     154}; // end namespace core
     155}; // end namespace multi_front_end
     156}; // end namespace front_end
     157}; // end namespace prediction_unit
     158}; // end namespace direction
     159
    151160
    152161}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_deallocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    6569}; // end namespace two_level_branch_predictor
    6670}; // end namespace meta_predictor
    67 }; // end namespace predictor
    68 }; // end namespace stage_1_ifetch
     71
     72}; // end namespace core
     73}; // end namespace multi_front_end
     74}; // end namespace front_end
     75}; // end namespace prediction_unit
     76}; // end namespace direction
     77
    6978
    7079}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_ack.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150}; // end namespace behavioural
    4251}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_bht_address.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150}; // end namespace behavioural
    4251}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_pht_address.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261}; // end namespace behavioural
    5362}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_ack.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150}; // end namespace behavioural
    4251}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_bht_address.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251}; // end namespace behavioural
    4352}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_pht_address.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4448}; // end namespace two_level_branch_predictor
    4549}; // end namespace meta_predictor
    46 }; // end namespace predictor
    47 }; // end namespace stage_1_ifetch
     50
     51}; // end namespace core
     52}; // end namespace multi_front_end
     53}; // end namespace front_end
     54}; // end namespace prediction_unit
     55}; // end namespace direction
     56
    4857}; // end namespace behavioural
    4958}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3236}; // end namespace two_level_branch_predictor
    3337}; // end namespace meta_predictor
    34 }; // end namespace predictor
    35 }; // end namespace stage_1_ifetch
     38
     39}; // end namespace core
     40}; // end namespace multi_front_end
     41}; // end namespace front_end
     42}; // end namespace prediction_unit
     43}; // end namespace direction
     44
    3645
    3746}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_transition.cpp

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     10#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"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl.cpp

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4246}; // end namespace two_level_branch_predictor
    4347}; // end namespace meta_predictor
    44 }; // end namespace predictor
    45 }; // end namespace stage_1_ifetch
     48
     49}; // end namespace core
     50}; // end namespace multi_front_end
     51}; // end namespace front_end
     52}; // end namespace prediction_unit
     53}; // end namespace direction
     54
    4655
    4756}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_body.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    153157}; // end namespace two_level_branch_predictor
    154158}; // end namespace meta_predictor
    155 }; // end namespace predictor
    156 }; // end namespace stage_1_ifetch
     159
     160}; // end namespace core
     161}; // end namespace multi_front_end
     162}; // end namespace front_end
     163}; // end namespace prediction_unit
     164}; // end namespace direction
     165
    157166
    158167}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_declaration.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2731}; // end namespace two_level_branch_predictor
    2832}; // end namespace meta_predictor
    29 }; // end namespace predictor
    30 }; // end namespace stage_1_ifetch
     33
     34}; // end namespace core
     35}; // end namespace multi_front_end
     36}; // end namespace front_end
     37}; // end namespace prediction_unit
     38}; // end namespace direction
     39
    3140
    3241}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_testbench_transition.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3236}; // end namespace two_level_branch_predictor
    3337}; // end namespace meta_predictor
    34 }; // end namespace predictor
    35 }; // end namespace stage_1_ifetch
     38
     39}; // end namespace core
     40}; // end namespace multi_front_end
     41}; // end namespace front_end
     42}; // end namespace prediction_unit
     43}; // end namespace direction
     44
    3645
    3746}; // end namespace behavioural

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

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

  • 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             

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

    r3 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    4246   
    4347    if (_have_bht)
    44     _param_branch_history_table  = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
     48    _param_branch_history_table  = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
    4549                                                                                                                                                                       _bht_nb_shifter    ,
    4650                                                                                                                                                                       _nb_prediction     ,
    4751                                                                                                                                                                       _nb_branch_complete);
    4852    if (_have_pht)
    49     _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
     53    _param_pattern_history_table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
    5054                                                                                                                                                                       _pht_nb_counter    ,
    5155                                                                                                                                                                       _nb_prediction     ,
    … …  
    5357   
    5458                                                     
    55     _param_two_level_branch_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht              ,
     59    _param_two_level_branch_predictor_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht              ,
    5660                                                                                                                                                                                           _bht_size_shifter      ,
    5761                                                                                                                                                                                           _bht_size_address      ,
    … …  
    8589
    8690    if (_have_bht)
    87     _param_branch_history_table  = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
     91    _param_branch_history_table  = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
    8892                                                                                                                                                                       _bht_nb_shifter    ,
    8993                                                                                                                                                                       _nb_prediction     ,
    9094                                                                                                                                                                       _nb_branch_complete);
    9195    if (_have_pht)
    92     _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
     96    _param_pattern_history_table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
    9397                                                                                                                                                                       _pht_nb_counter    ,
    9498                                                                                                                                                                       _nb_prediction     ,
    9599                                                                                                                                                                       _nb_branch_complete);
    96100
    97     _param_two_level_branch_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht              ,
     101    _param_two_level_branch_predictor_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht              ,
    98102                                                                                                                                                                                           _bht_size_shifter      ,
    99103                                                                                                                                                                                           _bht_size_address      ,
    … …  
    123127}; // end namespace two_level_branch_predictor
    124128}; // end namespace meta_predictor
    125 }; // end namespace predictor
    126 }; // end namespace stage_1_ifetch
     129
     130}; // end namespace core
     131}; // end namespace multi_front_end
     132}; // end namespace front_end
     133}; // end namespace prediction_unit
     134}; // end namespace direction
     135
    127136
    128137}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp

    r3 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    7983}; // end namespace two_level_branch_predictor
    8084}; // end namespace meta_predictor
    81 }; // end namespace predictor
    82 }; // end namespace stage_1_ifetch
     85
     86}; // end namespace core
     87}; // end namespace multi_front_end
     88}; // end namespace front_end
     89}; // end namespace prediction_unit
     90}; // end namespace direction
     91
    8392}; // end namespace behavioural
    8493}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4852
    4953  ostream& operator<< (ostream& output_stream ,
    50                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters & x)
     54                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x)
    5155  {
    5256    output_stream << x.print(0);
    … …  
    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}; // end namespace behavioural
    6271}; // end namespace morpheo             

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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_add.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    4448
    4549  ostream& operator<< (ostream& output_stream ,
    46                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Statistics & x)
     50                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Statistics & x)
    4751  {
    4852    output_stream << x.print(0);
    … …  
    5357}; // end namespace two_level_branch_predictor
    5458}; // end namespace meta_predictor
    55 }; // end namespace predictor
    56 }; // end namespace stage_1_ifetch
     59
     60}; // end namespace core
     61}; // end namespace multi_front_end
     62}; // end namespace front_end
     63}; // end namespace prediction_unit
     64}; // end namespace direction
     65
    5766
    5867}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print_body.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    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 {
    … …  
    3640}; // end namespace two_level_branch_predictor
    3741}; // end namespace meta_predictor
    38 }; // end namespace predictor
    39 }; // end namespace stage_1_ifetch
     42
     43}; // end namespace core
     44}; // end namespace multi_front_end
     45}; // end namespace front_end
     46}; // end namespace prediction_unit
     47}; // end namespace direction
     48
    4049
    4150}; // end namespace behavioural

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

    r42 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2428                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2529#endif
    26                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param ):
     30                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param ):
    2731                              _name              (name)
    2832                              ,_param            (param)
    … …  
    8791}; // end namespace two_level_branch_predictor
    8892}; // end namespace meta_predictor
    89 }; // end namespace predictor
    90 }; // end namespace stage_1_ifetch
     93
     94}; // end namespace core
     95}; // end namespace multi_front_end
     96}; // end namespace front_end
     97}; // end namespace prediction_unit
     98}; // end namespace direction
     99
    91100}; // end namespace behavioural
    92101}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    113117        name_component = _name+"_Branch_History_Table";
    114118       
    115         component_Branch_History_Table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table (name_component.c_str()
     119        component_Branch_History_Table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table (name_component.c_str()
    116120#ifdef STATISTICS
    117121                                                                                                                                                                                       ,_param_statistics
    … …  
    134138        name_component = _name+"_Pattern_History_Table";
    135139       
    136         component_Pattern_History_Table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table ::Pattern_History_Table (name_component.c_str()
     140        component_Pattern_History_Table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table ::Pattern_History_Table (name_component.c_str()
    137141#ifdef STATISTICS
    138142                                                                                                                                                                                          ,_param_statistics
    … …  
    154158    name_component = _name+"_Two_Level_Branch_Predictor_Glue";
    155159
    156     component_Two_Level_Branch_Predictor_Glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue (name_component.c_str()
     160    component_Two_Level_Branch_Predictor_Glue = new 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 (name_component.c_str()
    157161#ifdef STATISTICS
    158162                                                                                                                                                                                                                   ,_param_statistics
    … …  
    297301}; // end namespace two_level_branch_predictor
    298302}; // end namespace meta_predictor
    299 }; // end namespace predictor
    300 }; // end namespace stage_1_ifetch
     303
     304}; // end namespace core
     305}; // end namespace multi_front_end
     306}; // end namespace front_end
     307}; // end namespace prediction_unit
     308}; // end namespace direction
     309
    301310}; // end namespace behavioural
    302311}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    5458}; // end namespace two_level_branch_predictor
    5559}; // end namespace meta_predictor
    56 }; // end namespace predictor
    57 }; // end namespace stage_1_ifetch
     60
     61}; // end namespace core
     62}; // end namespace multi_front_end
     63}; // end namespace front_end
     64}; // end namespace prediction_unit
     65}; // end namespace direction
     66
    5867
    5968}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics.cpp

    r3 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     10#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4044}; // end namespace two_level_branch_predictor
    4145}; // end namespace meta_predictor
    42 }; // end namespace predictor
    43 }; // end namespace stage_1_ifetch
     46
     47}; // end namespace core
     48}; // end namespace multi_front_end
     49}; // end namespace front_end
     50}; // end namespace prediction_unit
     51}; // end namespace direction
     52
    4453
    4554}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2731}; // end namespace two_level_branch_predictor
    2832}; // end namespace meta_predictor
    29 }; // end namespace predictor
    30 }; // end namespace stage_1_ifetch
     33
     34}; // end namespace core
     35}; // end namespace multi_front_end
     36}; // end namespace front_end
     37}; // end namespace prediction_unit
     38}; // end namespace direction
     39
    3140
    3241}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039
    3140}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_testbench_transition.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3034}; // end namespace two_level_branch_predictor
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural
Note: See TracChangeset for help on using the changeset viewer.