Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Makefile (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Makefile (revision 5) @@ -0,0 +1,23 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_MORPHEO = ../../../.. + +#-----[ Library ]------------------------------------------ +LIBRARY = $(DIR_LIB)/libMeta_Predictor.a + + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_component + +include $(DIR_MORPHEO)/Behavioural/Makefile.defs +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Component Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Makefile.deps (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Makefile.deps (revision 5) @@ -0,0 +1,45 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# +# DIR_MORPHEO must be defined + +ifndef Behavioural +include $(DIR_MORPHEO)/Behavioural/Makefile.deps +endif +ifndef Two_Level_Branch_Predictor +include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps +endif +ifndef Meta_Predictor_Glue +include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps +endif + +Meta_Predictor = yes + +#-----[ Library ]------------------------------------------ +Meta_Predictor_LIBRARY = -lMeta_Predictor \ + $(Meta_Predictor_Glue_LIBRARY) \ + $(Two_Level_Branch_Predictor_LIBRARY) \ + $(Behavioural_LIBRARY) + +Meta_Predictor_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/lib \ + $(Meta_Predictor_Glue_DIR_LIBRARY) \ + $(Two_Level_Branch_Predictor_DIR_LIBRARY) \ + $(Behavioural_DIR_LIBRARY) + +#-----[ Rules ]-------------------------------------------- + +Meta_Predictor_library : + @$(MAKE) Behavioural_library + @$(MAKE) Meta_Predictor_Glue_library + @$(MAKE) Two_Level_Branch_Predictor_library + @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor --makefile=Makefile + +Meta_Predictor_library_clean : + @$(MAKE) Behavioural_library_clean + @$(MAKE) Meta_Predictor_Glue_library_clean + @$(MAKE) Two_Level_Branch_Predictor_library_clean + @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor --makefile=Makefile clean Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp (revision 5) @@ -45,4 +45,7 @@ // Interface Branch_complete + sc_signal ** BRANCH_COMPLETE_VAL ; + sc_signal ** BRANCH_COMPLETE_PREDICTOR_2_VAL ; + sc_signal ** BRANCH_COMPLETE_PREDICTOR_0_ACK ; sc_signal ** BRANCH_COMPLETE_PREDICTOR_1_ACK ; @@ -57,5 +60,6 @@ sc_signal ** BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY; sc_signal ** BRANCH_COMPLETE_HISTORY ; - + sc_signal ** BRANCH_COMPLETE_DIRECTION ; + sc_signal ** BRANCH_COMPLETE_PREDICTOR_2_DIRECTION ; string rename; @@ -108,5 +112,6 @@ // Interface Branch_complete - + BRANCH_COMPLETE_VAL = new sc_signal * [_param._nb_branch_complete ]; + BRANCH_COMPLETE_PREDICTOR_2_VAL = new sc_signal * [_param._nb_branch_complete ]; BRANCH_COMPLETE_PREDICTOR_0_ACK = new sc_signal * [_param._nb_branch_complete ]; BRANCH_COMPLETE_PREDICTOR_1_ACK = new sc_signal * [_param._nb_branch_complete ]; @@ -120,7 +125,13 @@ BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY = new sc_signal * [_param._nb_branch_complete ]; BRANCH_COMPLETE_HISTORY = new sc_signal * [_param._nb_branch_complete ]; + BRANCH_COMPLETE_DIRECTION = new sc_signal * [_param._nb_branch_complete ]; + BRANCH_COMPLETE_PREDICTOR_2_DIRECTION = new sc_signal * [_param._nb_branch_complete ]; for (uint32_t i=0; i<_param._nb_branch_complete; i++) { + rename = "BRANCH_COMPLETE_VAL_" +toString(i); + BRANCH_COMPLETE_VAL [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_PREDICTOR_2_VAL_" +toString(i); + BRANCH_COMPLETE_PREDICTOR_2_VAL [i] = new sc_signal (rename.c_str()); rename = "BRANCH_COMPLETE_PREDICTOR_0_ACK_" +toString(i); BRANCH_COMPLETE_PREDICTOR_0_ACK [i] = new sc_signal (rename.c_str()); @@ -145,4 +156,8 @@ rename = "BRANCH_COMPLETE_HISTORY_" +toString(i); BRANCH_COMPLETE_HISTORY [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_DIRECTION_" +toString(i); + BRANCH_COMPLETE_DIRECTION [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_" +toString(i); + BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i] = new sc_signal (rename.c_str()); } @@ -192,4 +207,7 @@ if (_param._have_meta_predictor) { + (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_VAL [i])) (*(BRANCH_COMPLETE_VAL [i])); + (*(_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])) (*(BRANCH_COMPLETE_PREDICTOR_2_VAL [i])); + (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_0_ACK [i])) (*(BRANCH_COMPLETE_PREDICTOR_0_ACK [i])); (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_1_ACK [i])) (*(BRANCH_COMPLETE_PREDICTOR_1_ACK [i])); @@ -214,4 +232,9 @@ (*(_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])) (*(BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])); (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_HISTORY [i])) (*(BRANCH_COMPLETE_HISTORY [i])); + if (_param._have_meta_predictor) + { + (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_DIRECTION [i])) (*(BRANCH_COMPLETE_DIRECTION [i])); + (*(_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])); + } } @@ -241,4 +264,5 @@ Tcontrol_t predict_direction [_param._nb_prediction]; + Tcontrol_t branch_complete_predictor_2_val [_param._nb_branch_complete]; Tcontrol_t branch_complete_ack [_param._nb_branch_complete]; Tbht_history_t branch_complete_predictor_0_bht_history [_param._nb_branch_complete]; @@ -248,4 +272,5 @@ Tbht_history_t branch_complete_predictor_2_bht_history [_param._nb_branch_complete]; Tpht_history_t branch_complete_predictor_2_pht_history [_param._nb_branch_complete]; + Tcontrol_t branch_complete_predictor_2_direction [_param._nb_branch_complete]; uint32_t shift_0 = 0; @@ -255,5 +280,5 @@ uint32_t shift_4 = shift_3 + _param._predictor_1_pht_size_counter; uint32_t shift_5 = shift_4 + _param._predictor_2_bht_size_shifter; -//uint32_t shift_5 = shift_5 + _param._predictor_2_pht_size_counter; +//uint32_t shift_6 = shift_5 + _param._predictor_2_pht_size_counter; for (uint32_t iteration=0; iteration> (_param._predictor_0_pht_size_counter-1)):(branch_complete_predictor_0_bht_history [i] >> (_param._predictor_0_bht_size_shifter-1)))&1; + Tcontrol_t direction_1 = ((_param._predictor_1_have_pht)?(branch_complete_predictor_1_pht_history [i] >> (_param._predictor_1_pht_size_counter-1)):(branch_complete_predictor_1_bht_history [i] >> (_param._predictor_1_bht_size_shifter-1)))&1; + Tcontrol_t direction_2 = ((_param._predictor_2_have_pht)?(branch_complete_predictor_2_pht_history [i] >> (_param._predictor_2_pht_size_counter-1)):(branch_complete_predictor_2_bht_history [i] >> (_param._predictor_2_bht_size_shifter-1)))&1; + + Tcontrol_t direction = ((rand()%2) != 0); + Tcontrol_t val = ((rand()%2) != 0); + + cout << "{"+toString(static_cast(sc_simulation_time()))+"} " << endl + << " * val : " << val << endl + << " * direction_good : " << direction << endl + << " * direction_0 : " << direction_0 << endl + << " * direction_1 : " << direction_1 << endl + << " * direction_2 : " << direction_2 << endl; + + BRANCH_COMPLETE_VAL [i] ->write (val); + BRANCH_COMPLETE_DIRECTION [i] ->write (direction); + + if (val == 0) + { + branch_complete_predictor_2_val [i] = val; + } + else + { + branch_complete_predictor_2_val [i] = (direction_0 xor direction_1); + if (direction_2 == 0) + if (direction_0 == direction) + branch_complete_predictor_2_direction [i] = 0; + else + branch_complete_predictor_2_direction [i] = 1; + else + if (direction_1 == direction) + branch_complete_predictor_2_direction [i] = 1; + else + branch_complete_predictor_2_direction [i] = 0; + } } @@ -370,4 +431,9 @@ if (_param._have_meta_predictor) { + TEST(Tcontrol_t , BRANCH_COMPLETE_PREDICTOR_2_VAL [i]->read(), branch_complete_predictor_2_val [i]); + + if (branch_complete_predictor_2_val [i]) + TEST(Tcontrol_t , BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i]->read(), branch_complete_predictor_2_direction [i]); + if (_param._predictor_0_have_bht) TEST(Tbht_history_t, BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i]->read(), branch_complete_predictor_0_bht_history [i]); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (revision 5) @@ -82,4 +82,7 @@ // Interface Branch_complete + public : SC_IN (Tcontrol_t) ** in_BRANCH_COMPLETE_VAL ; + public : SC_OUT(Tcontrol_t) ** out_BRANCH_COMPLETE_PREDICTOR_2_VAL ; + public : SC_IN (Tcontrol_t) ** in_BRANCH_COMPLETE_PREDICTOR_0_ACK ; public : SC_IN (Tcontrol_t) ** in_BRANCH_COMPLETE_PREDICTOR_1_ACK ; @@ -94,4 +97,6 @@ public : SC_OUT(Tpht_history_t) ** out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY; public : SC_IN (Thistory_t) ** in_BRANCH_COMPLETE_HISTORY ; + public : SC_IN (Tcontrol_t) ** in_BRANCH_COMPLETE_DIRECTION ; + public : SC_OUT(Tcontrol_t) ** out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION ; // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -130,4 +135,5 @@ public : void genMealy_predict_ack (void); public : void genMealy_predict_history (void); + public : void genMealy_branch_complete_val (void); public : void genMealy_branch_complete_ack (void); public : void genMealy_branch_complete_history (void); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h (revision 5) @@ -46,4 +46,12 @@ public : const uint32_t _size_history ; + public : const uint32_t _shift_0; + public : const uint32_t _shift_1; + public : const uint32_t _shift_2; + public : const uint32_t _shift_3; + public : const uint32_t _shift_4; + public : const uint32_t _shift_5; + public : const uint32_t _shift_6; + //-----[ methods ]----------------------------------------------------------- public : Parameters (bool have_meta_predictor , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (revision 5) @@ -163,4 +163,31 @@ } #endif + + if (_param._have_meta_predictor) + { + log_printf(INFO,Meta_Predictor_Glue,"Meta_Predictor_Glue","method - genMealy_branch_complete_val"); + SC_METHOD (genMealy_branch_complete_val); + dont_initialize (); + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + sensitive << *(in_BRANCH_COMPLETE_VAL [i]) + << *(in_BRANCH_COMPLETE_HISTORY [i]) + << *(in_BRANCH_COMPLETE_DIRECTION [i]); + } + +#ifdef SYSTEMCASS_SPECIFIC + // List dependency information + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + (*(out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])) (*(in_BRANCH_COMPLETE_VAL [i])); + (*(out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])) (*(in_BRANCH_COMPLETE_HISTORY [i])); + (*(out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])) (*(in_BRANCH_COMPLETE_DIRECTION [i])); + + (*(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(in_BRANCH_COMPLETE_VAL [i])); + (*(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(in_BRANCH_COMPLETE_HISTORY [i])); + (*(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(in_BRANCH_COMPLETE_DIRECTION [i])); + } +#endif + } log_printf(INFO,Meta_Predictor_Glue,"Meta_Predictor_Glue","method - genMealy_branch_complete_ack"); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (revision 5) @@ -114,4 +114,7 @@ if (_param._have_meta_predictor) { + in_BRANCH_COMPLETE_VAL = new SC_IN (Tcontrol_t) * [_param._nb_branch_complete ]; + out_BRANCH_COMPLETE_PREDICTOR_2_VAL = new SC_OUT(Tcontrol_t) * [_param._nb_branch_complete ]; + in_BRANCH_COMPLETE_PREDICTOR_0_ACK = new SC_IN (Tcontrol_t) * [_param._nb_branch_complete ]; in_BRANCH_COMPLETE_PREDICTOR_1_ACK = new SC_IN (Tcontrol_t) * [_param._nb_branch_complete ]; @@ -135,9 +138,19 @@ out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY = new SC_OUT(Tpht_history_t) * [_param._nb_branch_complete ]; in_BRANCH_COMPLETE_HISTORY = new SC_IN (Thistory_t) * [_param._nb_branch_complete ]; - + if (_param._have_meta_predictor) + { + in_BRANCH_COMPLETE_DIRECTION = new SC_IN (Tcontrol_t) * [_param._nb_branch_complete ]; + out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION = new SC_OUT(Tcontrol_t) * [_param._nb_branch_complete ]; + } for (uint32_t i=0; i<_param._nb_branch_complete; i++) { if (_param._have_meta_predictor) { + rename = " in_BRANCH_COMPLETE_VAL_" +toString(i); + in_BRANCH_COMPLETE_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + + rename = "out_BRANCH_COMPLETE_PREDICTOR_2_VAL_" +toString(i); + out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + rename = " in_BRANCH_COMPLETE_PREDICTOR_0_ACK_" +toString(i); in_BRANCH_COMPLETE_PREDICTOR_0_ACK [i] = new SC_IN (Tcontrol_t) (rename.c_str()); @@ -187,6 +200,14 @@ rename = " in_BRANCH_COMPLETE_HISTORY_" +toString(i); in_BRANCH_COMPLETE_HISTORY [i] = new SC_IN (Thistory_t) (rename.c_str()); - } - + + if (_param._have_meta_predictor) + { + rename = " in_BRANCH_COMPLETE_DIRECTION_" +toString(i); + in_BRANCH_COMPLETE_DIRECTION [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + + rename = "out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_" +toString(i); + out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + } + } // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (revision 5) @@ -84,4 +84,7 @@ if (_param._have_meta_predictor) { + delete in_BRANCH_COMPLETE_VAL [i]; + delete out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i]; + delete in_BRANCH_COMPLETE_PREDICTOR_0_ACK [i]; delete in_BRANCH_COMPLETE_PREDICTOR_1_ACK [i]; @@ -106,8 +109,16 @@ delete out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i]; delete in_BRANCH_COMPLETE_HISTORY [i]; + if (_param._have_meta_predictor) + { + delete in_BRANCH_COMPLETE_DIRECTION [i]; + delete out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i]; + } } if (_param._have_meta_predictor) { + delete in_BRANCH_COMPLETE_VAL ; + delete out_BRANCH_COMPLETE_PREDICTOR_2_VAL ; + delete in_BRANCH_COMPLETE_PREDICTOR_0_ACK ; delete in_BRANCH_COMPLETE_PREDICTOR_1_ACK ; @@ -131,5 +142,9 @@ delete out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY ; delete in_BRANCH_COMPLETE_HISTORY ; - + if (_param._have_meta_predictor) + { + delete in_BRANCH_COMPLETE_DIRECTION ; + delete out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION ; + } // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp (revision 5) @@ -28,36 +28,21 @@ { if (_param._predictor_0_have_bht) - { - PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i], history & gen_mask(_param._predictor_0_bht_size_shifter)); - history >>= _param._predictor_0_bht_size_shifter; - } + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i], (history >> _param._shift_0) & gen_mask(_param._predictor_0_bht_size_shifter)); if (_param._predictor_0_have_pht) - { - PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i], history & gen_mask(_param._predictor_0_pht_size_counter)); - history >>= _param._predictor_0_pht_size_counter; + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i], (history >> _param._shift_1) & gen_mask(_param._predictor_0_pht_size_counter)); } if (_param._predictor_1_have_bht) { - PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i], history & gen_mask(_param._predictor_1_bht_size_shifter)); - history >>= _param._predictor_1_bht_size_shifter; - } + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i], (history >> _param._shift_2) & gen_mask(_param._predictor_1_bht_size_shifter)); + if (_param._predictor_1_have_pht) - { - PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i], history & gen_mask(_param._predictor_1_pht_size_counter)); - history >>= _param._predictor_1_pht_size_counter; - } + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i], (history >> _param._shift_3) & gen_mask(_param._predictor_1_pht_size_counter)); } if (_param._predictor_2_have_bht) - { - PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i], history & gen_mask(_param._predictor_2_bht_size_shifter)); - history >>= _param._predictor_2_bht_size_shifter; - } + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i], (history >> _param._shift_4) & gen_mask(_param._predictor_2_bht_size_shifter)); if (_param._predictor_2_have_pht) - { - PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i], history & gen_mask(_param._predictor_2_pht_size_counter)); - history >>= _param._predictor_2_pht_size_counter; - } + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i], (history >> _param._shift_5) & gen_mask(_param._predictor_2_pht_size_counter)); } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp (revision 5) @@ -0,0 +1,82 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { +namespace meta_predictor_glue { + + void Meta_Predictor_Glue::genMealy_branch_complete_val (void) + { + log_printf(FUNC,Meta_Predictor_Glue,"genMealy_branch_complete_val","Begin"); + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + Tcontrol_t val = PORT_READ(in_BRANCH_COMPLETE_VAL [i]); + Thistory_t history = PORT_READ(in_BRANCH_COMPLETE_HISTORY [i]); + Tcontrol_t direction = PORT_READ(in_BRANCH_COMPLETE_DIRECTION [i]); + + Tcontrol_t predictor_0_direction = (history>>(_param._shift_2-1))&1; + Tcontrol_t predictor_1_direction = (history>>(_param._shift_4-1))&1; +// Tcontrol_t predictor_2_direction = (history>>(_param._shift_6-1))&1; + +// log_printf(TRACE,Meta_Predictor_Glue,"genMealy_branch_complete_val","direction_(predictor_0 %d, predictor_1 %d, predictor_2 %d, good %d)", predictor_0_direction, predictor_1_direction, predictor_2_direction, direction); + log_printf(TRACE,Meta_Predictor_Glue,"genMealy_branch_complete_val","direction_(predictor_0 %d, predictor_1 %d, good %d)", predictor_0_direction, predictor_1_direction, direction); + + log_printf(TRACE,Meta_Predictor_Glue,"genMealy_branch_complete_val"," * direction_0 : %d >>(%d-1)",history,_param._shift_2); + log_printf(TRACE,Meta_Predictor_Glue,"genMealy_branch_complete_val"," * direction_1 : %d >>(%d-1)",history,_param._shift_4); + log_printf(TRACE,Meta_Predictor_Glue,"genMealy_branch_complete_val"," * direction_2 : %d >>(%d-1)",history,_param._shift_6); + + /* + dir_0 dir_1 dir_2 | good_dir || next_dir_2 + ------------------+-----------++----------- + 0 0 0 | 0 || no change + 1 0 0 | 0 || 1 select pred_0 but miss + 0 1 0 | 0 || 0 select pred_0 and hit + 1 1 0 | 0 || no change + 0 0 1 | 0 || no change + 1 0 1 | 0 || 1 select pred_1 and hit + 0 1 1 | 0 || 0 select pred_1 but miss + 1 1 1 | 0 || no change + 0 0 0 | 1 || no change + 1 0 0 | 1 || 0 select pred_0 and hit + 0 1 0 | 1 || 1 select pred_0 but miss + 1 1 0 | 1 || no change + 0 0 1 | 1 || no change + 1 0 1 | 1 || 0 select pred_1 but miss + 0 1 1 | 1 || 1 select pred_1 and hit + 1 1 1 | 1 || no change + + next_dir_2 = (good_dir and dir_1) or (not good_dir and dir_0) + */ + + Tcontrol_t branch_complete_predictor_2_val = val and (predictor_0_direction xor predictor_1_direction); + Tcontrol_t branch_complete_predictor_2_direction = ( (not direction and predictor_0_direction) or + ( direction and predictor_1_direction) ); + + log_printf(TRACE,Meta_Predictor_Glue,"genMealy_branch_complete_val","branch_complete_predictor_2_( val %d, direction %d)",branch_complete_predictor_2_val, branch_complete_predictor_2_direction); + + // Modify meta_predictor if have a branch_complete and twice prediction have not predict the same way + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i], branch_complete_predictor_2_direction); + PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i], branch_complete_predictor_2_val ); + } + + log_printf(FUNC,Meta_Predictor_Glue,"genMealy_branch_complete_val","End"); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp (revision 5) @@ -35,5 +35,5 @@ predictor_2_pht_history = PORT_READ(in_PREDICT_PREDICTOR_2_PHT_HISTORY [i]); predictor_2_pht_direction = predictor_2_pht_history >> (_param._predictor_2_pht_size_counter-1); - history = (history << _param._predictor_2_pht_size_counter) | predictor_2_pht_history; + history |= (predictor_2_pht_history << _param._shift_5); } if (_param._predictor_2_have_bht) @@ -41,5 +41,5 @@ predictor_2_bht_history = PORT_READ(in_PREDICT_PREDICTOR_2_BHT_HISTORY [i]); predictor_2_bht_direction = predictor_2_bht_history >> (_param._predictor_2_bht_size_shifter-1); - history = (history << _param._predictor_2_bht_size_shifter) | predictor_2_bht_history; + history |= (predictor_2_bht_history << _param._shift_4); } @@ -52,5 +52,5 @@ predictor_1_pht_history = PORT_READ(in_PREDICT_PREDICTOR_1_PHT_HISTORY [i]); predictor_1_pht_direction = predictor_1_pht_history >> (_param._predictor_1_pht_size_counter-1); - history = (history << _param._predictor_1_pht_size_counter) | predictor_1_pht_history; + history |= (predictor_1_pht_history << _param._shift_3); } if (_param._predictor_1_have_bht) @@ -58,5 +58,5 @@ predictor_1_bht_history = PORT_READ(in_PREDICT_PREDICTOR_1_BHT_HISTORY [i]); predictor_1_bht_direction = predictor_1_bht_history >> (_param._predictor_1_bht_size_shifter-1); - history = (history << _param._predictor_1_bht_size_shifter) | predictor_1_bht_history; + history |= (predictor_1_bht_history << _param._shift_2) ; } if (_param._predictor_0_have_pht) @@ -64,5 +64,5 @@ predictor_0_pht_history = PORT_READ(in_PREDICT_PREDICTOR_0_PHT_HISTORY [i]); predictor_0_pht_direction = predictor_0_pht_history >> (_param._predictor_0_pht_size_counter-1); - history = (history << _param._predictor_0_pht_size_counter) | predictor_0_pht_history; + history |= (predictor_0_pht_history << _param._shift_1); } if (_param._predictor_0_have_bht) @@ -70,5 +70,5 @@ predictor_0_bht_history = PORT_READ(in_PREDICT_PREDICTOR_0_BHT_HISTORY [i]); predictor_0_bht_direction = predictor_0_bht_history >> (_param._predictor_0_bht_size_shifter-1); - history = (history << _param._predictor_0_bht_size_shifter) | predictor_0_bht_history; + history |= (predictor_0_bht_history << _param._shift_0); } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (revision 5) @@ -71,7 +71,7 @@ vhdl.set_body (""); if (_param._have_meta_predictor) - vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+" <= predictor_0_direction_"+toString(i)+" when predictor_2_direction_"+toString(i)+"='0' else predictor_1_direction_"+toString(i)+";"); + vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+" <= predict_predictor_0_direction_"+toString(i)+" when predict_predictor_2_direction_"+toString(i)+"='0' else predict_predictor_1_direction_"+toString(i)+";"); else - vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+" <= predictor_2_direction_"+toString(i)+";"); + vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+" <= predict_predictor_2_direction_"+toString(i)+";"); } @@ -82,7 +82,14 @@ for (uint32_t i=0; i<_param._nb_branch_complete; i++) { + // branch_complete_predictor_2 val and directionn + if (_param._have_meta_predictor) + { + vhdl.set_body ("out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+" <= (branch_complete_predictor_0_direction_"+toString(i)+" xor branch_complete_predictor_1_direction_"+toString(i)+") and "+"in_BRANCH_COMPLETE_VAL_"+toString(i)+";"); + vhdl.set_body ("out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+" <= (branch_complete_predictor_0_direction_"+toString(i)+" and not in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+") or (branch_complete_predictor_1_direction_"+toString(i)+" and in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+");"); + } + string meta_predictor_ack = (_param._have_meta_predictor==true)?("in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+" and in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)):"'1'"; - vhdl.set_body ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" <= "+meta_predictor_ack+" and "+"in_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)+";"); + vhdl.set_body ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" <= "+meta_predictor_ack+" and "+"in_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)+";"); uint32_t index=_param._size_history; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (revision 5) @@ -26,18 +26,43 @@ { if (_param._predictor_0_have_pht) - vhdl.set_alias ("predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_pht_size_counter-1,_param._predictor_0_pht_size_counter-1)); + vhdl.set_alias ("predict_predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_pht_size_counter-1,_param._predictor_0_pht_size_counter-1)); else - vhdl.set_alias ("predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_bht_size_shifter-1,_param._predictor_0_bht_size_shifter-1)); + vhdl.set_alias ("predict_predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_bht_size_shifter-1,_param._predictor_0_bht_size_shifter-1)); if (_param._predictor_1_have_pht) - vhdl.set_alias ("predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_pht_size_counter-1,_param._predictor_1_pht_size_counter-1)); + vhdl.set_alias ("predict_predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_pht_size_counter-1,_param._predictor_1_pht_size_counter-1)); else - vhdl.set_alias ("predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_bht_size_shifter-1,_param._predictor_1_bht_size_shifter-1)); + vhdl.set_alias ("predict_predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_bht_size_shifter-1,_param._predictor_1_bht_size_shifter-1)); } if (_param._predictor_2_have_pht) - vhdl.set_alias ("predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_pht_size_counter-1,_param._predictor_2_pht_size_counter-1)); + vhdl.set_alias ("predict_predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_pht_size_counter-1,_param._predictor_2_pht_size_counter-1)); else - vhdl.set_alias ("predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_bht_size_shifter-1,_param._predictor_2_bht_size_shifter-1)); + vhdl.set_alias ("predict_predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_bht_size_shifter-1,_param._predictor_2_bht_size_shifter-1)); } + + if (_param._have_meta_predictor) + { + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { +// if (_param._predictor_2_have_pht) +// vhdl.set_alias ("branch_complete_predictor_2_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_6-1, _param._shift_6-1)); +// else +// vhdl.set_alias ("branch_complete_predictor_2_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_5-1, _param._shift_5-1)); + + if (_param._predictor_1_have_pht) + vhdl.set_alias ("branch_complete_predictor_1_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_4-1, _param._shift_4-1)); + else + vhdl.set_alias ("branch_complete_predictor_1_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_3-1, _param._shift_3-1)); + + if (_param._predictor_0_have_pht) + vhdl.set_alias ("branch_complete_predictor_0_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_2-1, _param._shift_2-1)); + else + vhdl.set_alias ("branch_complete_predictor_0_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_1-1, _param._shift_1-1)); + + } + } + + + log_printf(FUNC,Meta_Predictor_Glue,"vhdl_declaration","End"); }; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_port.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_port.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_port.cpp (revision 5) @@ -55,4 +55,7 @@ if (_param._have_meta_predictor) { + vhdl.set_port (" in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", IN, 1); + vhdl.set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+" ",OUT, 1); + vhdl.set_port (" in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+" ", IN, 1); vhdl.set_port (" in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)+" ", IN, 1); @@ -78,4 +81,9 @@ vhdl.set_port (" in_BRANCH_COMPLETE_HISTORY_"+toString(i)+" ", IN,_param._size_history); + if (_param._have_meta_predictor) + { + vhdl.set_port (" in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", IN,1); + vhdl.set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+" ",OUT,1); + } } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_port.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_port.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_port.cpp (revision 5) @@ -55,4 +55,7 @@ if (_param._have_meta_predictor) { + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", IN, 1); + _vhdl_testbench->set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+" ",OUT, 1); + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+" ", IN, 1); _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)+" ", IN, 1); @@ -78,4 +81,9 @@ _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_HISTORY_"+toString(i)+" ", IN,_param._size_history); + if (_param._have_meta_predictor) + { + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", IN,1); + _vhdl_testbench->set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+" ",OUT,1); + } } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp (revision 5) @@ -62,4 +62,7 @@ if (_param._have_meta_predictor) { + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_VAL [i])); + _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])); + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_PREDICTOR_0_ACK [i])); _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_PREDICTOR_1_ACK [i])); @@ -84,5 +87,10 @@ _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])); - _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_HISTORY [i])); + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_HISTORY [i])); + if (_param._have_meta_predictor) + { + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_DIRECTION [i])); + _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])); + } } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp (revision 5) @@ -53,5 +53,13 @@ _size_history (_predictor_0_bht_size_shifter + _predictor_0_pht_size_counter + _predictor_1_bht_size_shifter + _predictor_1_pht_size_counter + - _predictor_2_bht_size_shifter + _predictor_2_pht_size_counter ) + _predictor_2_bht_size_shifter + _predictor_2_pht_size_counter ), + + _shift_0 (0), + _shift_1 (_shift_0 + _predictor_0_bht_size_shifter), + _shift_2 (_shift_1 + _predictor_0_pht_size_counter), + _shift_3 (_shift_2 + _predictor_1_bht_size_shifter), + _shift_4 (_shift_3 + _predictor_1_pht_size_counter), + _shift_5 (_shift_4 + _predictor_2_bht_size_shifter), + _shift_6 (_shift_5 + _predictor_2_pht_size_counter) { log_printf(FUNC,Meta_Predictor_Glue,"Parameters","Begin"); @@ -81,5 +89,14 @@ _nb_branch_complete (param._nb_branch_complete ), - _size_history (param._size_history ) + _size_history (param._size_history ), + + _shift_0 (param._shift_0 ), + _shift_1 (param._shift_1 ), + _shift_2 (param._shift_2 ), + _shift_3 (param._shift_3 ), + _shift_4 (param._shift_4 ), + _shift_5 (param._shift_5 ), + _shift_6 (param._shift_6 ) + { log_printf(FUNC,Meta_Predictor_Glue,"Parameters","Begin"); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/Makefile (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/Makefile (revision 5) @@ -0,0 +1,29 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_MORPHEO = ../../../../.. + +LIBRARY = $(Meta_Predictor_LIBRARY) + +DIR_LIBRARY = $(Meta_Predictor_DIR_LIBRARY) + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_selftest + +library : Meta_Predictor_library + +library_clean : Meta_Predictor_library_clean + +include ../Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Makefile.defs +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Selftest +include $(DIR_MORPHEO)/Behavioural/Makefile.Synthesis Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/configuration.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/configuration.cfg (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/configuration.cfg (revision 5) @@ -0,0 +1,26 @@ +Meta_Predictor +0 0 +1 # have_meta_predictor +1 1 +1 # predictor_0_have_bht +10 10 +1 # predictor_0_bht_size_shifter +1024 1024 *2 # predictor_0_bht_nb_shifter +1 1 +1 # predictor_0_have_pht +3 3 +1 # predictor_0_pht_size_counter +1024 1024 *2 # predictor_0_pht_nb_counter +0 0 +1 # predictor_0_pht_size_address_share +1 1 +1 # predictor_1_have_bht +12 12 +1 # predictor_1_bht_size_shifter +2 2 *2 # predictor_1_bht_nb_shifter +1 1 +1 # predictor_1_have_pht +2 2 +1 # predictor_1_pht_size_counter +4096 4096 *2 # predictor_1_pht_nb_counter +0 0 +1 # predictor_1_pht_size_address_share +0 0 +1 # predictor_2_have_bht +4 4 +1 # predictor_2_bht_size_shifter +256 256 *2 # predictor_2_bht_nb_shifter +1 1 +1 # predictor_2_have_pht +2 2 +1 # predictor_2_pht_size_counter +4096 4096 *2 # predictor_2_pht_nb_counter +0 0 +1 # predictor_2_pht_size_address_share +30 30 *2 # size_address +1 1 +1 # nb_prediction +1 1 +1 # nb_branch_complete Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h (revision 5) @@ -0,0 +1,26 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test "RegisterFile" + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + +#include +#include + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +using namespace std; +using namespace morpheo; +using namespace morpheo::behavioural; +using namespace morpheo::behavioural::stage_1_ifetch; +using namespace morpheo::behavioural::stage_1_ifetch::predictor; +using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; + +void test (string name, + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/src/main.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/src/main.cpp (revision 5) @@ -0,0 +1,131 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h" + +#define NB_PARAMS 25 + +void usage (string exec) +{ + cerr << " " << exec << " name_instance list_params" << endl + << "list_params is :" << endl + << " - have_meta_predictor (bool )" << endl + << " - predictor_0_have_bht (bool )" << endl + << " - predictor_0_bht_size_shifter (uint32_t)" << endl + << " - predictor_0_bht_nb_shifter (uint32_t)" << endl + << " - predictor_0_have_pht (bool )" << endl + << " - predictor_0_pht_size_counter (uint32_t)" << endl + << " - predictor_0_pht_nb_counter (uint32_t)" << endl + << " - predictor_0_pht_size_address_share (uint32_t)" << endl + << " - predictor_1_have_bht (bool )" << endl + << " - predictor_1_bht_size_shifter (uint32_t)" << endl + << " - predictor_1_bht_nb_shifter (uint32_t)" << endl + << " - predictor_1_have_pht (bool )" << endl + << " - predictor_1_pht_size_counter (uint32_t)" << endl + << " - predictor_1_pht_nb_counter (uint32_t)" << endl + << " - predictor_1_pht_size_address_share (uint32_t)" << endl + << " - predictor_2_have_bht (bool )" << endl + << " - predictor_2_bht_size_shifter (uint32_t)" << endl + << " - predictor_2_bht_nb_shifter (uint32_t)" << endl + << " - predictor_2_have_pht (bool )" << endl + << " - predictor_2_pht_size_counter (uint32_t)" << endl + << " - predictor_2_pht_nb_counter (uint32_t)" << endl + << " - predictor_2_pht_size_address_share (uint32_t)" << endl + << " - size_address (uint32_t)" << endl + << " - nb_prediction (uint32_t)" << endl + << " - nb_branch_complete (uint32_t)" << endl; + + exit (1); +} + +#ifndef SYSTEMC +int main (int argc, char * argv[]) +#else +int sc_main (int argc, char * argv[]) +#endif +{ + if (argc != 2+NB_PARAMS) + usage (argv[0]); + + const string name = argv[1]; + + const bool have_meta_predictor = atoi(argv[ 2]); + + const bool predictor_0_have_bht = atoi(argv[ 3]); + const uint32_t predictor_0_bht_size_shifter = atoi(argv[ 4]); + const uint32_t predictor_0_bht_nb_shifter = atoi(argv[ 5]); + const bool predictor_0_have_pht = atoi(argv[ 6]); + const uint32_t predictor_0_pht_size_counter = atoi(argv[ 7]); + const uint32_t predictor_0_pht_nb_counter = atoi(argv[ 8]); + const uint32_t predictor_0_pht_size_address_share= atoi(argv[ 9]); + + const bool predictor_1_have_bht = atoi(argv[10]); + const uint32_t predictor_1_bht_size_shifter = atoi(argv[11]); + const uint32_t predictor_1_bht_nb_shifter = atoi(argv[12]); + const bool predictor_1_have_pht = atoi(argv[13]); + const uint32_t predictor_1_pht_size_counter = atoi(argv[14]); + const uint32_t predictor_1_pht_nb_counter = atoi(argv[15]); + const uint32_t predictor_1_pht_size_address_share= atoi(argv[16]); + + const bool predictor_2_have_bht = atoi(argv[17]); + const uint32_t predictor_2_bht_size_shifter = atoi(argv[18]); + const uint32_t predictor_2_bht_nb_shifter = atoi(argv[19]); + const bool predictor_2_have_pht = atoi(argv[20]); + const uint32_t predictor_2_pht_size_counter = atoi(argv[21]); + const uint32_t predictor_2_pht_nb_counter = atoi(argv[22]); + const uint32_t predictor_2_pht_size_address_share= atoi(argv[23]); + + const uint32_t size_address = atoi(argv[24]); + const uint32_t nb_prediction = atoi(argv[25]); + const uint32_t nb_branch_complete = atoi(argv[26]); + + try + { + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param (have_meta_predictor , + predictor_0_have_bht , + predictor_0_bht_size_shifter , + predictor_0_bht_nb_shifter , + predictor_0_have_pht , + predictor_0_pht_size_counter , + predictor_0_pht_nb_counter , + predictor_0_pht_size_address_share, + predictor_1_have_bht , + predictor_1_bht_size_shifter , + predictor_1_bht_nb_shifter , + predictor_1_have_pht , + predictor_1_pht_size_counter , + predictor_1_pht_nb_counter , + predictor_1_pht_size_address_share, + predictor_2_have_bht , + predictor_2_bht_size_shifter , + predictor_2_bht_nb_shifter , + predictor_2_have_pht , + predictor_2_pht_size_counter , + predictor_2_pht_nb_counter , + predictor_2_pht_size_address_share, + size_address , + nb_prediction , + nb_branch_complete ); + + cout << param.print(1); + + test (name,param); + } + catch (morpheo::ErrorMorpheo & error) + { + cout << "<" << name << "> : " << error.what (); + exit (EXIT_FAILURE); + } + catch (...) + { + cerr << "<" << name << "> : This test must generate a error" << endl; + exit (EXIT_FAILURE); + } + + return (EXIT_SUCCESS); +} + Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/src/test.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/src/test.cpp (revision 5) @@ -0,0 +1,150 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test + */ + +#define NB_ITERATION 1 + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h" +#include "Include/Test.h" + +void test (string name, + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters _param) +{ + cout << "<" << name << "> : Simulation SystemC" << endl; + + Meta_Predictor * _Meta_Predictor = new Meta_Predictor (name.c_str(), +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics(5,50), +#endif + _param); + +#ifdef SYSTEMC + /********************************************************************* + * Déclarations des signaux + *********************************************************************/ + sc_clock * CLOCK ; + + // Interface Predict + sc_signal ** PREDICT_VAL ; + sc_signal ** PREDICT_ACK ; + sc_signal ** PREDICT_ADDRESS ; + sc_signal ** PREDICT_HISTORY ; + sc_signal ** PREDICT_DIRECTION ; + + // Interface Branch_complete + sc_signal ** BRANCH_COMPLETE_VAL ; + sc_signal ** BRANCH_COMPLETE_ACK ; + sc_signal ** BRANCH_COMPLETE_ADDRESS ; + sc_signal ** BRANCH_COMPLETE_HISTORY ; + sc_signal ** BRANCH_COMPLETE_DIRECTION ; + + string rename; + + CLOCK = new sc_clock ("clock", 1.0, 0.5); + + PREDICT_VAL = new sc_signal * [_param._nb_prediction ]; + PREDICT_ACK = new sc_signal * [_param._nb_prediction ]; + PREDICT_ADDRESS = new sc_signal * [_param._nb_prediction ]; + PREDICT_HISTORY = new sc_signal * [_param._nb_prediction ]; + PREDICT_DIRECTION = new sc_signal * [_param._nb_prediction ]; + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + rename = "PREDICT_VAL_" +toString(i); + PREDICT_VAL [i] = new sc_signal (rename.c_str()); + rename = "PREDICT_ACK_" +toString(i); + PREDICT_ACK [i] = new sc_signal (rename.c_str()); + rename = "PREDICT_ADDRESS_" +toString(i); + PREDICT_ADDRESS [i] = new sc_signal (rename.c_str()); + rename = "PREDICT_HISTORY_" +toString(i); + PREDICT_HISTORY [i] = new sc_signal (rename.c_str()); + rename = "PREDICT_DIRECTION_" +toString(i); + PREDICT_DIRECTION [i] = new sc_signal (rename.c_str()); + } + + BRANCH_COMPLETE_VAL = new sc_signal * [_param._nb_branch_complete]; + BRANCH_COMPLETE_ACK = new sc_signal * [_param._nb_branch_complete]; + BRANCH_COMPLETE_ADDRESS = new sc_signal * [_param._nb_branch_complete]; + BRANCH_COMPLETE_HISTORY = new sc_signal * [_param._nb_branch_complete]; + BRANCH_COMPLETE_DIRECTION = new sc_signal * [_param._nb_branch_complete]; + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + rename = "BRANCH_COMPLETE_VAL_" +toString(i); + BRANCH_COMPLETE_VAL [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_ACK_" +toString(i); + BRANCH_COMPLETE_ACK [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_ADDRESS_" +toString(i); + BRANCH_COMPLETE_ADDRESS [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_HISTORY_" +toString(i); + BRANCH_COMPLETE_HISTORY [i] = new sc_signal (rename.c_str()); + rename = "BRANCH_COMPLETE_DIRECTION_" +toString(i); + BRANCH_COMPLETE_DIRECTION [i] = new sc_signal (rename.c_str()); + } + + /******************************************************** + * Instanciation + ********************************************************/ + + cout << "<" << name << "> Instanciation of _Meta_Predictor" << endl; + + (*(_Meta_Predictor->in_CLOCK)) (*(CLOCK)); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + (*(_Meta_Predictor-> in_PREDICT_VAL [i])) (*(PREDICT_VAL [i])); + (*(_Meta_Predictor->out_PREDICT_ACK [i])) (*(PREDICT_ACK [i])); + (*(_Meta_Predictor-> in_PREDICT_ADDRESS [i])) (*(PREDICT_ADDRESS [i])); + (*(_Meta_Predictor->out_PREDICT_HISTORY [i])) (*(PREDICT_HISTORY [i])); + (*(_Meta_Predictor->out_PREDICT_DIRECTION [i])) (*(PREDICT_DIRECTION [i])); + } + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + (*(_Meta_Predictor-> in_BRANCH_COMPLETE_VAL [i])) (*(BRANCH_COMPLETE_VAL [i])); + (*(_Meta_Predictor->out_BRANCH_COMPLETE_ACK [i])) (*(BRANCH_COMPLETE_ACK [i])); + (*(_Meta_Predictor-> in_BRANCH_COMPLETE_ADDRESS [i])) (*(BRANCH_COMPLETE_ADDRESS [i])); + (*(_Meta_Predictor-> in_BRANCH_COMPLETE_HISTORY [i])) (*(BRANCH_COMPLETE_HISTORY [i])); + (*(_Meta_Predictor-> in_BRANCH_COMPLETE_DIRECTION [i])) (*(BRANCH_COMPLETE_DIRECTION [i])); + } + + /******************************************************** + * Simulation - Begin + ********************************************************/ + + cout << "<" << name << "> Start Simulation ............" << endl; + + // Initialisation + const uint32_t seed = 0; +//const uint32_t seed = static_cast(time(NULL)); + + srand(seed); + + sc_start(0); + _Meta_Predictor->vhdl_testbench_label("Initialisation"); + cout << "{"+toString(static_cast(sc_simulation_time()))+"} Initialisation" << endl; + + + _Meta_Predictor->vhdl_testbench_label("Loop of Test"); + cout << "{"+toString(static_cast(sc_simulation_time()))+"} Loop of Test" << endl; + + for (uint32_t iteration=0; iterationvhdl_testbench_label("Iteration "+toString(iteration)); + + sc_start(1); + } + + /******************************************************** + * Simulation - End + ********************************************************/ + + cout << "<" << name << "> ............ Stop Simulation" << endl; + +#endif + + delete _Meta_Predictor; +} Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg (revision 5) @@ -1,11 +1,11 @@ Two_Level_Branch_Predictor 1 1 +1 # have_bht -6 8 +1 # bht_size_shifter -64 64 *2 # bht_nb_shifter -0 1 +1 # have_pht -4 4 +1 # pht_size_counter -256 512 *2 # pht_nb_counter -0 2 +1 # pht_size_address_share +8 8 +1 # bht_size_shifter +512 512 *2 # bht_nb_shifter +1 1 +1 # have_pht +8 8 +1 # pht_size_counter +512 512 *2 # pht_nb_counter +2 2 +1 # pht_size_address_share 16 16 +1 # size_address -1 1 +1 # nb_prediction -1 1 +1 # nb_branch_complete +2 2 +1 # nb_prediction +2 2 +1 # nb_branch_complete Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (revision 5) @@ -220,4 +220,5 @@ cout << "{"+toString(static_cast(sc_simulation_time()))+"} Predict : bht_history " << bht_history << " - pht_history " << pht_history[bht_history] << endl; + // Ask a new prediction PREDICT_VAL [num_port_predict ]->write(1); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h (revision 5) @@ -51,5 +51,5 @@ protected : const Parameters _param; //#ifdef STATISTICS -// protected : const morpheo::behavioural::Parameters_Statistics _param_statistics; +//protected : const morpheo::behavioural::Parameters_Statistics _param_statistics; //#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (revision 4) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (revision 5) @@ -57,7 +57,9 @@ allocation (); +#if (defined(STATISTICS) || defined (VHDL_TESTBENCH)) SC_METHOD (transition); dont_initialize (); sensitive_pos << *(in_CLOCK); +#endif // SC_METHOD (genMoore); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/VERSION =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/VERSION (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/VERSION (revision 5) @@ -0,0 +1,1 @@ +v0.4 Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h (revision 5) @@ -0,0 +1,175 @@ +#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Meta_Predictor_h +#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Meta_Predictor_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + +#include +#include "Include/ToString.h" +#include "Include/Debug.h" + +// Internal structure +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h" +#ifdef STATISTICS +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" +#endif +#ifdef VHDL +#include "Behavioural/include/Vhdl.h" +#endif +#ifdef VHDL_TESTBENCH +#include "Behavioural/include/Vhdl_Testbench.h" +#endif + +using namespace std; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + class Meta_Predictor +#if SYSTEMC + : public sc_module +#endif + { + // -----[ fields ]---------------------------------------------------- + // Parameters + protected : const string _name; + + protected : const Parameters _param; +#ifdef STATISTICS + protected : const morpheo::behavioural::Parameters_Statistics _param_statistics; +#endif + +#ifdef STATISTICS + private : Statistics * _stat; +#endif + +#ifdef VHDL_TESTBENCH + private : Vhdl_Testbench * _vhdl_testbench; +#endif + +#ifdef SYSTEMC + // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Interface + public : SC_CLOCK * in_CLOCK ; + + // Interface Predict + public : SC_IN (Tcontrol_t) ** in_PREDICT_VAL ; + public : SC_OUT(Tcontrol_t) ** out_PREDICT_ACK ; + public : SC_IN (Taddress_t) ** in_PREDICT_ADDRESS ; + public : SC_OUT(Thistory_t) ** out_PREDICT_HISTORY ; + public : SC_OUT(Tcontrol_t) ** out_PREDICT_DIRECTION ; + + // Interface Branch_complete + public : SC_IN (Tcontrol_t) ** in_BRANCH_COMPLETE_VAL ; + public : SC_OUT(Tcontrol_t) ** out_BRANCH_COMPLETE_ACK ; + public : SC_IN (Taddress_t) ** in_BRANCH_COMPLETE_ADDRESS ; + public : SC_IN (Thistory_t) ** in_BRANCH_COMPLETE_HISTORY ; + public : SC_IN (Tcontrol_t) ** in_BRANCH_COMPLETE_DIRECTION ; + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_0; + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_1; + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_2; + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue * component_Meta_Predictor_Glue ; + + // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // Interface Predict + private : SC_SIGNAL(Tcontrol_t) ** signal_PREDICT_PREDICTOR_0_ACK ; + private : SC_SIGNAL(Tcontrol_t) ** signal_PREDICT_PREDICTOR_1_ACK ; + private : SC_SIGNAL(Tcontrol_t) ** signal_PREDICT_PREDICTOR_2_ACK ; + + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_0_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_0_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_1_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_1_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_2_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_2_PHT_HISTORY; + + + private : SC_SIGNAL(Tcontrol_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_ACK ; + private : SC_SIGNAL(Tcontrol_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_ACK ; + private : SC_SIGNAL(Tcontrol_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_VAL ; + private : SC_SIGNAL(Tcontrol_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_ACK ; + private : SC_SIGNAL(Tcontrol_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION; + + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY; + +#endif + + // -----[ methods ]--------------------------------------------------- + +#ifdef SYSTEMC + SC_HAS_PROCESS (Meta_Predictor); +#endif + public : Meta_Predictor ( +#ifdef SYSTEMC + sc_module_name name, +#else + string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics param_statistics, +#endif + Parameters param ); + + public : Meta_Predictor (Parameters param ); + public : ~Meta_Predictor (void); + +#ifdef SYSTEMC + private : void allocation (void); + private : void deallocation (void); + +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + public : void transition (void); +#endif +#endif +#ifdef STATISTICS + public : string statistics (uint32_t depth); +#endif + +#if VHDL + public : void vhdl (void); + private : void vhdl_port (Vhdl & vhdl); + private : void vhdl_declaration (Vhdl & vhdl); + private : void vhdl_body (Vhdl & vhdl); +#endif + +#ifdef VHDL_TESTBENCH + private : void vhdl_testbench_port (void); + private : void vhdl_testbench_transition (void); +#endif + public : void vhdl_testbench_label (string label); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h (revision 5) @@ -0,0 +1,109 @@ +#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Parameters_h +#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Parameters_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Include/Debug.h" +#include "Behavioural/include/Parameters.h" +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + class Parameters : public morpheo::behavioural::Parameters + { + //-----[ fields ]------------------------------------------------------------ + public : const bool _have_meta_predictor ; + + public : const bool _predictor_0_have_bht ; + public : const uint32_t _predictor_0_bht_size_shifter ; + public : const uint32_t _predictor_0_bht_nb_shifter ; + public : const bool _predictor_0_have_pht ; + public : const uint32_t _predictor_0_pht_size_counter ; + public : const uint32_t _predictor_0_pht_nb_counter ; + public : const uint32_t _predictor_0_pht_size_address_share; + + public : const bool _predictor_1_have_bht ; + public : const uint32_t _predictor_1_bht_size_shifter ; + public : const uint32_t _predictor_1_bht_nb_shifter ; + public : const bool _predictor_1_have_pht ; + public : const uint32_t _predictor_1_pht_size_counter ; + public : const uint32_t _predictor_1_pht_nb_counter ; + public : const uint32_t _predictor_1_pht_size_address_share; + + public : const bool _predictor_2_have_bht ; + public : const uint32_t _predictor_2_bht_size_shifter ; + public : const uint32_t _predictor_2_bht_nb_shifter ; + public : const bool _predictor_2_have_pht ; + public : const uint32_t _predictor_2_pht_size_counter ; + public : const uint32_t _predictor_2_pht_nb_counter ; + public : const uint32_t _predictor_2_pht_size_address_share; + + public : const uint32_t _size_address ; + public : const uint32_t _nb_prediction ; + public : const uint32_t _nb_branch_complete ; + + public : const uint32_t _size_history ; + + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_0; + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_1; + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_2; + public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters * _param_meta_predictor_glue; + + //-----[ methods ]----------------------------------------------------------- + public : Parameters (bool have_meta_predictor , + + bool predictor_0_have_bht , + uint32_t predictor_0_bht_size_shifter , + uint32_t predictor_0_bht_nb_shifter , + bool predictor_0_have_pht , + uint32_t predictor_0_pht_size_counter , + uint32_t predictor_0_pht_nb_counter , + uint32_t predictor_0_pht_size_address_share, + + bool predictor_1_have_bht , + uint32_t predictor_1_bht_size_shifter , + uint32_t predictor_1_bht_nb_shifter , + bool predictor_1_have_pht , + uint32_t predictor_1_pht_size_counter , + uint32_t predictor_1_pht_nb_counter , + uint32_t predictor_1_pht_size_address_share, + + bool predictor_2_have_bht , + uint32_t predictor_2_bht_size_shifter , + uint32_t predictor_2_bht_nb_shifter , + bool predictor_2_have_pht , + uint32_t predictor_2_pht_size_counter , + uint32_t predictor_2_pht_nb_counter , + uint32_t predictor_2_pht_size_address_share, + + uint32_t size_address , + uint32_t nb_prediction , + uint32_t nb_branch_complete ); + public : Parameters (Parameters & param) ; + public : ~Parameters () ; + + public : string msg_error (void); + + public : string print (uint32_t depth); + public : friend ostream& operator<< (ostream& output_stream, + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters & x); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h (revision 5) @@ -0,0 +1,58 @@ +#ifdef STATISTICS +#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Statistics_h +#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Statistics_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Include/Debug.h" +#include "Behavioural/include/Statistics.h" +#include "Behavioural/include/Parameters_Statistics.h" +//#include "Behavioural/Generic/Group/include/Statistics.h" +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" + +//using namespace morpheo::behavioural::generic::group; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + class Statistics : public morpheo::behavioural::Statistics + { + // -----[ fields ]---------------------------------------------------- + private : const Parameters _parameters; + + // -----[ methods ]--------------------------------------------------- + public : Statistics (string name , + morpheo::behavioural::Parameters_Statistics parameters_statistics , + Parameters parameters + ); +//public : Statistics (Statistics & stat); + public : ~Statistics () ; + + public : string print_body (uint32_t depth); + public : string print (uint32_t depth); + public : string print (uint32_t depth, string component_stat); + public : void add (); + + public : friend ostream& operator<< (ostream& output_stream, + const Statistics & x); + + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h (revision 5) @@ -0,0 +1,28 @@ +#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Type_h +#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Type_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Include/Types.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + typedef uint32_t Taddress_t; + typedef uint32_t Thistory_t; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor.cpp (revision 5) @@ -0,0 +1,100 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + +#ifdef SYSTEMC + Meta_Predictor::Meta_Predictor (sc_module_name name, +#else + Meta_Predictor::Meta_Predictor (string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics param_statistics, +#endif + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param ): + _name (name) + ,_param (param) +#ifdef STATISTICS + ,_param_statistics (param_statistics) +#endif + { + log_printf(FUNC,Meta_Predictor,"Meta_Predictor","Begin"); + +#ifdef STATISTICS + // Allocation of statistics + _stat = new Statistics (static_cast(_name), + param_statistics , + param); +#endif + +#ifdef VHDL_TESTBENCH + // Creation of a testbench + // -> port + // -> clock's signals + _vhdl_testbench = new Vhdl_Testbench (_name); + vhdl_testbench_port (); + _vhdl_testbench->set_clock ("in_CLOCK",true); +#endif + +#ifdef VHDL + // generate the vhdl + vhdl(); +#endif + +#ifdef SYSTEMC + allocation (); + +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + SC_METHOD (transition); + dont_initialize (); + sensitive_pos << *(in_CLOCK); +#endif + +#ifdef SYSTEMCASS_SPECIFIC + // List dependency information +#endif + +#endif + log_printf(FUNC,Meta_Predictor,"Meta_Predictor","End"); + }; + + Meta_Predictor::~Meta_Predictor (void) + { + log_printf(FUNC,Meta_Predictor,"~Meta_Predictor","Begin"); + +#ifdef VHDL_TESTBENCH + // generate the test bench + _vhdl_testbench->generate_file(); + delete _vhdl_testbench; +#endif + +#ifdef STATISTICS + _stat->generate_file(statistics(0)); + + delete _stat; +#endif + +#ifdef SYSTEMC + deallocation (); +#endif + + log_printf(FUNC,Meta_Predictor,"~Meta_Predictor","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_allocation.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_allocation.cpp (revision 5) @@ -0,0 +1,437 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::allocation (void) + { + string rename; + + log_printf(FUNC,Meta_Predictor,"allocation","Begin"); + + in_CLOCK = new SC_CLOCK ("in_CLOCK"); + + in_PREDICT_VAL = new SC_IN (Tcontrol_t) * [_param._nb_prediction ]; + out_PREDICT_ACK = new SC_OUT(Tcontrol_t) * [_param._nb_prediction ]; + in_PREDICT_ADDRESS = new SC_IN (Taddress_t) * [_param._nb_prediction ]; + out_PREDICT_HISTORY = new SC_OUT(Thistory_t) * [_param._nb_prediction ]; + out_PREDICT_DIRECTION = new SC_OUT(Tcontrol_t) * [_param._nb_prediction ]; + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + rename = "in_PREDICT_VAL_" +toString(i); + in_PREDICT_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + + rename = "out_PREDICT_ACK_" +toString(i); + out_PREDICT_ACK [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + + rename = "in_PREDICT_ADDRESS_" +toString(i); + in_PREDICT_ADDRESS [i] = new SC_IN (Taddress_t) (rename.c_str()); + + rename = "out_PREDICT_HISTORY_" +toString(i); + out_PREDICT_HISTORY [i] = new SC_OUT(Thistory_t) (rename.c_str()); + + rename = "out_PREDICT_DIRECTION_" +toString(i); + out_PREDICT_DIRECTION [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + } + + in_BRANCH_COMPLETE_VAL = new SC_IN (Tcontrol_t) * [_param._nb_branch_complete]; + out_BRANCH_COMPLETE_ACK = new SC_OUT(Tcontrol_t) * [_param._nb_branch_complete]; + in_BRANCH_COMPLETE_ADDRESS = new SC_IN (Taddress_t) * [_param._nb_branch_complete]; + in_BRANCH_COMPLETE_HISTORY = new SC_IN (Thistory_t) * [_param._nb_branch_complete]; + in_BRANCH_COMPLETE_DIRECTION = new SC_IN (Tcontrol_t) * [_param._nb_branch_complete]; + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + rename = "in_BRANCH_COMPLETE_VAL_" +toString(i); + in_BRANCH_COMPLETE_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + + rename = "out_BRANCH_COMPLETE_ACK_" +toString(i); + out_BRANCH_COMPLETE_ACK [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + + rename = "in_BRANCH_COMPLETE_ADDRESS_" +toString(i); + in_BRANCH_COMPLETE_ADDRESS [i] = new SC_IN (Taddress_t) (rename.c_str()); + + rename = "in_BRANCH_COMPLETE_HISTORY_" +toString(i); + in_BRANCH_COMPLETE_HISTORY [i] = new SC_IN (Thistory_t) (rename.c_str()); + + rename = "in_BRANCH_COMPLETE_DIRECTION_" +toString(i); + in_BRANCH_COMPLETE_DIRECTION [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + } + + // ~~~~~[ Signal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + if (_param._have_meta_predictor) + { + signal_PREDICT_PREDICTOR_0_ACK = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + signal_PREDICT_PREDICTOR_1_ACK = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + } + signal_PREDICT_PREDICTOR_2_ACK = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + signal_PREDICT_PREDICTOR_0_BHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) * [_param._nb_prediction]; + if (_param._predictor_0_have_pht) + signal_PREDICT_PREDICTOR_0_PHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) * [_param._nb_prediction]; + if (_param._predictor_0_have_bht) + signal_PREDICT_PREDICTOR_1_BHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) * [_param._nb_prediction]; + if (_param._predictor_1_have_pht) + signal_PREDICT_PREDICTOR_1_PHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) * [_param._nb_prediction]; + } + if (_param._predictor_2_have_bht) + signal_PREDICT_PREDICTOR_2_BHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) * [_param._nb_prediction]; + if (_param._predictor_2_have_pht) + signal_PREDICT_PREDICTOR_2_PHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) * [_param._nb_prediction]; + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + if (_param._have_meta_predictor) + { + rename = "signal_PREDICT_PREDICTOR_0_ACK_"+toString(i); + signal_PREDICT_PREDICTOR_0_ACK [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + rename = "signal_PREDICT_PREDICTOR_1_ACK_"+toString(i); + signal_PREDICT_PREDICTOR_1_ACK [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + } + rename = "signal_PREDICT_PREDICTOR_2_ACK_"+toString(i); + signal_PREDICT_PREDICTOR_2_ACK [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + { + rename = "signal_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i); + signal_PREDICT_PREDICTOR_0_BHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) (rename.c_str()); + } + if (_param._predictor_0_have_pht) + { + rename = "signal_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i); + signal_PREDICT_PREDICTOR_0_PHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) (rename.c_str()); + } + if (_param._predictor_1_have_bht) + { + rename = "signal_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i); + signal_PREDICT_PREDICTOR_1_BHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) (rename.c_str()); + } + if (_param._predictor_1_have_pht) + { + rename = "signal_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i); + signal_PREDICT_PREDICTOR_1_PHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) (rename.c_str()); + } + } + if (_param._predictor_2_have_bht) + { + rename = "signal_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i); + signal_PREDICT_PREDICTOR_2_BHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) (rename.c_str()); + } + if (_param._predictor_2_have_pht) + { + rename = "signal_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i); + signal_PREDICT_PREDICTOR_2_PHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) (rename.c_str()); + } + } + if (_param._have_meta_predictor) + { + signal_BRANCH_COMPLETE_PREDICTOR_0_ACK = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + signal_BRANCH_COMPLETE_PREDICTOR_1_ACK = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + signal_BRANCH_COMPLETE_PREDICTOR_2_VAL = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + } + signal_BRANCH_COMPLETE_PREDICTOR_2_ACK = new SC_SIGNAL(Tcontrol_t) * [_param._nb_prediction]; + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) * [_param._nb_prediction]; + if (_param._predictor_0_have_pht) + signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) * [_param._nb_prediction]; + if (_param._predictor_0_have_bht) + signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) * [_param._nb_prediction]; + if (_param._predictor_1_have_pht) + signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) * [_param._nb_prediction]; + } + if (_param._predictor_2_have_bht) + signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) * [_param._nb_prediction]; + if (_param._predictor_2_have_pht) + signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) * [_param._nb_prediction]; + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_0_ACK [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + rename = "signal_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_1_ACK [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + rename = "signal_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_2_VAL [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + rename = "signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + } + rename = "signal_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_2_ACK [i] = new SC_SIGNAL(Tcontrol_t) (rename.c_str()); + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) (rename.c_str()); + } + if (_param._predictor_0_have_pht) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) (rename.c_str()); + } + if (_param._predictor_1_have_bht) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) (rename.c_str()); + } + if (_param._predictor_1_have_pht) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) (rename.c_str()); + } + } + if (_param._predictor_2_have_bht) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) (rename.c_str()); + } + if (_param._predictor_2_have_pht) + { + rename = "signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY_"+toString(i); + signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i] = new SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) (rename.c_str()); + } + } + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + string name_component; + + // =====[ component_Meta_Predictor_Glue ]============================= + + name_component = _name+"_Meta_Predictor_Glue"; + + log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); + + component_Meta_Predictor_Glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue (name_component.c_str() , +#ifdef STATISTICS + _param_statistics , +#endif + *(_param._param_meta_predictor_glue)); + + // Instantiation + (*(component_Meta_Predictor_Glue->in_CLOCK)) (*(in_CLOCK)); + + // Interface Predict + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + if (_param._have_meta_predictor) + { + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_0_ACK [i])) (*(signal_PREDICT_PREDICTOR_0_ACK [i])); + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_1_ACK [i])) (*(signal_PREDICT_PREDICTOR_1_ACK [i])); + } + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_2_ACK [i])) (*(signal_PREDICT_PREDICTOR_2_ACK [i])); + (*(component_Meta_Predictor_Glue->out_PREDICT_ACK [i])) (*( out_PREDICT_ACK [i])); + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_0_BHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_0_BHT_HISTORY [i])); + if (_param._predictor_0_have_pht) + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_0_PHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_0_PHT_HISTORY [i])); + if (_param._predictor_1_have_bht) + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_1_BHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_1_BHT_HISTORY [i])); + if (_param._predictor_1_have_pht) + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_1_PHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_1_PHT_HISTORY [i])); + } + if (_param._predictor_2_have_bht) + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_2_BHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_2_BHT_HISTORY [i])); + if (_param._predictor_2_have_pht) + (*(component_Meta_Predictor_Glue-> in_PREDICT_PREDICTOR_2_PHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_2_PHT_HISTORY [i])); + (*(component_Meta_Predictor_Glue->out_PREDICT_HISTORY [i])) (*( out_PREDICT_HISTORY [i])); + (*(component_Meta_Predictor_Glue->out_PREDICT_DIRECTION [i])) (*( out_PREDICT_DIRECTION [i])); + } + + // Interface Branch_complete + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + { + (*(component_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_VAL [i])) (*( in_BRANCH_COMPLETE_VAL [i])); + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])); + + (*(component_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_0_ACK [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_0_ACK [i])); + (*(component_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_1_ACK [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_1_ACK [i])); + } + (*(component_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_2_ACK [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_ACK [i])); + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_ACK [i])) (*( out_BRANCH_COMPLETE_ACK [i])); + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i])); + if (_param._predictor_0_have_pht) + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i])); + if (_param._predictor_1_have_bht) + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i])); + if (_param._predictor_1_have_pht) + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i])); + } + if (_param._predictor_2_have_bht) + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i])); + if (_param._predictor_2_have_pht) + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])); + (*(component_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_HISTORY [i])) (*( in_BRANCH_COMPLETE_HISTORY [i])); + if (_param._have_meta_predictor) + { + (*(component_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_DIRECTION [i])) (*( in_BRANCH_COMPLETE_DIRECTION [i])); + (*(component_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])); + } + } + + // =====[ component_Two_Level_Branch_Predictor_2 ]==================== + + name_component = _name+"_Two_Level_Branch_Predictor_2"; + + log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); + + component_Two_Level_Branch_Predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , +#ifdef STATISTICS + _param_statistics , +#endif + *(_param._param_two_level_branch_predictor_2)); + + // Instantiation + (*(component_Two_Level_Branch_Predictor_2->in_CLOCK)) (*(in_CLOCK)); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + (*(component_Two_Level_Branch_Predictor_2-> in_PREDICT_VAL [i])) (*( in_PREDICT_VAL [i])); + (*(component_Two_Level_Branch_Predictor_2->out_PREDICT_ACK [i])) (*(signal_PREDICT_PREDICTOR_2_ACK [i])); + (*(component_Two_Level_Branch_Predictor_2-> in_PREDICT_ADDRESS [i])) (*( in_PREDICT_ADDRESS [i])); + if (_param._predictor_2_have_bht) + (*(component_Two_Level_Branch_Predictor_2->out_PREDICT_BHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_2_BHT_HISTORY [i])); + if (_param._predictor_2_have_pht) + (*(component_Two_Level_Branch_Predictor_2->out_PREDICT_PHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_2_PHT_HISTORY [i])); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_VAL [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_VAL [i])); + else + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_VAL [i])) (*( in_BRANCH_COMPLETE_VAL [i])); + (*(component_Two_Level_Branch_Predictor_2->out_BRANCH_COMPLETE_ACK [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_ACK [i])); + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_ADDRESS [i])) (*( in_BRANCH_COMPLETE_ADDRESS [i])); + if (_param._predictor_2_have_bht) + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_BHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i])); + if (_param._predictor_2_have_pht) + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_PHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])); + if (_param._have_meta_predictor) + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_DIRECTION [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])); + else + (*(component_Two_Level_Branch_Predictor_2-> in_BRANCH_COMPLETE_DIRECTION [i])) (*( in_BRANCH_COMPLETE_DIRECTION [i])); + } + + if (_param._have_meta_predictor) + { + // =====[ component_Two_Level_Branch_Predictor_1 ]==================== + + name_component = _name+"_Two_Level_Branch_Predictor_1"; + + log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); + + component_Two_Level_Branch_Predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , +#ifdef STATISTICS + _param_statistics , +#endif + *(_param._param_two_level_branch_predictor_1)); + + // Instantiation + (*(component_Two_Level_Branch_Predictor_1->in_CLOCK)) (*(in_CLOCK)); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + (*(component_Two_Level_Branch_Predictor_1-> in_PREDICT_VAL [i])) (*( in_PREDICT_VAL [i])); + (*(component_Two_Level_Branch_Predictor_1->out_PREDICT_ACK [i])) (*(signal_PREDICT_PREDICTOR_1_ACK [i])); + (*(component_Two_Level_Branch_Predictor_1-> in_PREDICT_ADDRESS [i])) (*( in_PREDICT_ADDRESS [i])); + if (_param._predictor_1_have_bht) + (*(component_Two_Level_Branch_Predictor_1->out_PREDICT_BHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_1_BHT_HISTORY [i])); + if (_param._predictor_1_have_pht) + (*(component_Two_Level_Branch_Predictor_1->out_PREDICT_PHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_1_PHT_HISTORY [i])); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + (*(component_Two_Level_Branch_Predictor_1-> in_BRANCH_COMPLETE_VAL [i])) (*( in_BRANCH_COMPLETE_VAL [i])); + (*(component_Two_Level_Branch_Predictor_1->out_BRANCH_COMPLETE_ACK [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_1_ACK [i])); + (*(component_Two_Level_Branch_Predictor_1-> in_BRANCH_COMPLETE_ADDRESS [i])) (*( in_BRANCH_COMPLETE_ADDRESS [i])); + if (_param._predictor_1_have_bht) + (*(component_Two_Level_Branch_Predictor_1-> in_BRANCH_COMPLETE_BHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i])); + if (_param._predictor_1_have_pht) + (*(component_Two_Level_Branch_Predictor_1-> in_BRANCH_COMPLETE_PHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i])); + (*(component_Two_Level_Branch_Predictor_1-> in_BRANCH_COMPLETE_DIRECTION [i])) (*( in_BRANCH_COMPLETE_DIRECTION [i])); + } + + // =====[ component_Two_Level_Branch_Predictor_0 ]==================== + + name_component = _name+"_Two_Level_Branch_Predictor_0"; + + log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); + + component_Two_Level_Branch_Predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , +#ifdef STATISTICS + _param_statistics , +#endif + *(_param._param_two_level_branch_predictor_0)); + + // Instantiation + (*(component_Two_Level_Branch_Predictor_0->in_CLOCK)) (*(in_CLOCK)); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + (*(component_Two_Level_Branch_Predictor_0-> in_PREDICT_VAL [i])) (*( in_PREDICT_VAL [i])); + (*(component_Two_Level_Branch_Predictor_0->out_PREDICT_ACK [i])) (*(signal_PREDICT_PREDICTOR_0_ACK [i])); + (*(component_Two_Level_Branch_Predictor_0-> in_PREDICT_ADDRESS [i])) (*( in_PREDICT_ADDRESS [i])); + if (_param._predictor_0_have_bht) + (*(component_Two_Level_Branch_Predictor_0->out_PREDICT_BHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_0_BHT_HISTORY [i])); + if (_param._predictor_0_have_pht) + (*(component_Two_Level_Branch_Predictor_0->out_PREDICT_PHT_HISTORY [i])) (*(signal_PREDICT_PREDICTOR_0_PHT_HISTORY [i])); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + (*(component_Two_Level_Branch_Predictor_0-> in_BRANCH_COMPLETE_VAL [i])) (*( in_BRANCH_COMPLETE_VAL [i])); + (*(component_Two_Level_Branch_Predictor_0->out_BRANCH_COMPLETE_ACK [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_0_ACK [i])); + (*(component_Two_Level_Branch_Predictor_0-> in_BRANCH_COMPLETE_ADDRESS [i])) (*( in_BRANCH_COMPLETE_ADDRESS [i])); + if (_param._predictor_0_have_bht) + (*(component_Two_Level_Branch_Predictor_0-> in_BRANCH_COMPLETE_BHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i])); + if (_param._predictor_0_have_pht) + (*(component_Two_Level_Branch_Predictor_0-> in_BRANCH_COMPLETE_PHT_HISTORY [i])) (*(signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i])); + (*(component_Two_Level_Branch_Predictor_0-> in_BRANCH_COMPLETE_DIRECTION [i])) (*( in_BRANCH_COMPLETE_DIRECTION [i])); + } + } + + log_printf(FUNC,Meta_Predictor,"allocation","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_deallocation.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_deallocation.cpp (revision 5) @@ -0,0 +1,177 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + void Meta_Predictor::deallocation (void) + { + log_printf(FUNC,Meta_Predictor,"deallocation","Begin"); + + delete in_CLOCK; + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + delete in_PREDICT_VAL [i]; + delete out_PREDICT_ACK [i]; + delete in_PREDICT_ADDRESS [i]; + delete out_PREDICT_HISTORY [i]; + delete out_PREDICT_DIRECTION [i]; + } + + delete in_PREDICT_VAL ; + delete out_PREDICT_ACK ; + delete in_PREDICT_ADDRESS ; + delete out_PREDICT_HISTORY ; + delete out_PREDICT_DIRECTION ; + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + delete in_BRANCH_COMPLETE_VAL [i]; + delete out_BRANCH_COMPLETE_ACK [i]; + delete in_BRANCH_COMPLETE_ADDRESS [i]; + delete in_BRANCH_COMPLETE_HISTORY [i]; + delete in_BRANCH_COMPLETE_DIRECTION [i]; + } + + delete in_BRANCH_COMPLETE_VAL ; + delete out_BRANCH_COMPLETE_ACK ; + delete in_BRANCH_COMPLETE_ADDRESS ; + delete in_BRANCH_COMPLETE_HISTORY ; + delete in_BRANCH_COMPLETE_DIRECTION ; + + // ~~~~~[ Signal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + if (_param._have_meta_predictor) + { + delete signal_PREDICT_PREDICTOR_0_ACK [i]; + delete signal_PREDICT_PREDICTOR_1_ACK [i]; + } + delete signal_PREDICT_PREDICTOR_2_ACK [i]; + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + delete signal_PREDICT_PREDICTOR_0_BHT_HISTORY [i]; + if (_param._predictor_0_have_pht) + delete signal_PREDICT_PREDICTOR_0_PHT_HISTORY [i]; + if (_param._predictor_1_have_bht) + delete signal_PREDICT_PREDICTOR_1_BHT_HISTORY [i]; + if (_param._predictor_1_have_pht) + delete signal_PREDICT_PREDICTOR_1_PHT_HISTORY [i]; + } + if (_param._predictor_2_have_bht) + delete signal_PREDICT_PREDICTOR_2_BHT_HISTORY [i]; + if (_param._predictor_2_have_pht) + delete signal_PREDICT_PREDICTOR_2_PHT_HISTORY [i]; + } + + if (_param._have_meta_predictor) + { + delete signal_PREDICT_PREDICTOR_0_ACK ; + delete signal_PREDICT_PREDICTOR_1_ACK ; + } + delete signal_PREDICT_PREDICTOR_2_ACK ; + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + delete signal_PREDICT_PREDICTOR_0_BHT_HISTORY; + if (_param._predictor_0_have_pht) + delete signal_PREDICT_PREDICTOR_0_PHT_HISTORY; + if (_param._predictor_0_have_bht) + delete signal_PREDICT_PREDICTOR_1_BHT_HISTORY; + if (_param._predictor_1_have_pht) + delete signal_PREDICT_PREDICTOR_1_PHT_HISTORY; + } + if (_param._predictor_2_have_bht) + delete signal_PREDICT_PREDICTOR_2_BHT_HISTORY; + if (_param._predictor_2_have_pht) + delete signal_PREDICT_PREDICTOR_2_PHT_HISTORY; + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + { + delete signal_BRANCH_COMPLETE_PREDICTOR_0_ACK [i]; + delete signal_BRANCH_COMPLETE_PREDICTOR_1_ACK [i]; + delete signal_BRANCH_COMPLETE_PREDICTOR_2_VAL [i]; + delete signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i]; + } + delete signal_BRANCH_COMPLETE_PREDICTOR_2_ACK [i]; + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + delete signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i]; + if (_param._predictor_0_have_pht) + delete signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i]; + if (_param._predictor_1_have_bht) + delete signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i]; + if (_param._predictor_1_have_pht) + delete signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i]; + } + if (_param._predictor_2_have_bht) + delete signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i]; + if (_param._predictor_2_have_pht) + delete signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i]; + } + + if (_param._have_meta_predictor) + { + delete signal_BRANCH_COMPLETE_PREDICTOR_0_ACK ; + delete signal_BRANCH_COMPLETE_PREDICTOR_1_ACK ; + delete signal_BRANCH_COMPLETE_PREDICTOR_2_VAL ; + delete signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION ; + } + delete signal_BRANCH_COMPLETE_PREDICTOR_2_ACK ; + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + delete signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY; + if (_param._predictor_0_have_pht) + delete signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY; + if (_param._predictor_0_have_bht) + delete signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY; + if (_param._predictor_1_have_pht) + delete signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY; + } + if (_param._predictor_2_have_bht) + delete signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY; + if (_param._predictor_2_have_pht) + delete signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY; + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + if (_param._have_meta_predictor) + { + delete component_Two_Level_Branch_Predictor_0; + delete component_Two_Level_Branch_Predictor_1; + } + delete component_Two_Level_Branch_Predictor_2; + delete component_Meta_Predictor_Glue ; + + + log_printf(FUNC,Meta_Predictor,"deallocation","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_statistics.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_statistics.cpp (revision 5) @@ -0,0 +1,44 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + string Meta_Predictor::statistics (uint32_t depth) + { + log_printf(FUNC,Meta_Predictor,"statistics","Begin"); + + string stat_component_Two_Level_Branch_Predictor_0 = (_param._have_meta_predictor==false)?"":component_Two_Level_Branch_Predictor_0->statistics(depth+1); + string stat_component_Two_Level_Branch_Predictor_1 = (_param._have_meta_predictor==false)?"":component_Two_Level_Branch_Predictor_1->statistics(depth+1); + string stat_component_Two_Level_Branch_Predictor_2 = component_Two_Level_Branch_Predictor_2->statistics(depth+1); + string stat_component_Meta_Predictor_Glue = component_Meta_Predictor_Glue ->statistics(depth+1); + + string txt = _stat->print(depth, + stat_component_Two_Level_Branch_Predictor_0 + + stat_component_Two_Level_Branch_Predictor_1 + + stat_component_Two_Level_Branch_Predictor_2 + + stat_component_Meta_Predictor_Glue ); + + log_printf(FUNC,Meta_Predictor,"statistics","End"); + + return txt; + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_transition.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_transition.cpp (revision 5) @@ -0,0 +1,41 @@ +#ifdef SYSTEMC +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::transition (void) + { + log_printf(FUNC,Meta_Predictor,"transition","Begin"); + +#ifdef STATISTICS + _stat->add(); +#endif + +#ifdef VHDL_TESTBENCH + vhdl_testbench_transition (); +#endif + + log_printf(FUNC,Meta_Predictor,"transition","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl.cpp (revision 5) @@ -0,0 +1,48 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/include/Vhdl.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl (void) + { + log_printf(FUNC,Meta_Predictor,"vhdl","Begin"); + Vhdl vhdl (_name); + + vhdl.set_library_work (_name + "_Pack"); + vhdl.set_library_work (_name + "_Meta_Predictor_Glue_Pack"); + if (_param._have_meta_predictor) + { + vhdl.set_library_work (_name + "_Two_Level_Branch_Predictor_0_Pack"); + vhdl.set_library_work (_name + "_Two_Level_Branch_Predictor_1_Pack"); + } + vhdl.set_library_work (_name + "_Two_Level_Branch_Predictor_2_Pack"); + + vhdl_port (vhdl); + vhdl_declaration (vhdl); + vhdl_body (vhdl); + + vhdl.generate_file(); + log_printf(FUNC,Meta_Predictor,"vhdl","End"); + + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp (revision 5) @@ -0,0 +1,218 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl_body (Vhdl & vhdl) + { + log_printf(FUNC,Meta_Predictor,"vhdl_body","Begin"); + vhdl.set_body (""); + + list list_port_map; + + // =====[ component_Meta_Predictor_Glue ]============================= + + list_port_map.clear(); + log_printf(INFO,Meta_Predictor,"vhdl_body","Instanciation : component_Meta_Predictor_Glue"); + + // Instantiation + + // Interface Predict + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + if (_param._have_meta_predictor) + { + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_0_ACK_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_0_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_1_ACK_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_1_ACK_"+toString(i)); + } + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_2_ACK_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_2_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_ACK_"+toString(i)+" ", " out_PREDICT_ACK_"+toString(i)); + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i)); + if (_param._predictor_0_have_pht) + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i)); + if (_param._predictor_1_have_bht) + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i)); + if (_param._predictor_1_have_pht) + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i)); + } + if (_param._predictor_2_have_bht) + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i)); + if (_param._predictor_2_have_pht) + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_HISTORY_"+toString(i)+" ", " out_PREDICT_HISTORY_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_DIRECTION_"+toString(i)+" ", " out_PREDICT_DIRECTION_"+toString(i)); + } + + // Interface Branch_complete + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + { + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", " in_BRANCH_COMPLETE_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)); + + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)); + } + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_ACK_"+toString(i)+" ", " out_BRANCH_COMPLETE_ACK_"+toString(i)); + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY_"+toString(i)); + if (_param._predictor_0_have_pht) + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY_"+toString(i)); + if (_param._predictor_1_have_bht) + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY_"+toString(i)); + if (_param._predictor_1_have_pht) + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY_"+toString(i)); + } + if (_param._predictor_2_have_bht) + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY_"+toString(i)); + if (_param._predictor_2_have_pht) + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_HISTORY_"+toString(i)+" ", " in_BRANCH_COMPLETE_HISTORY_"+toString(i)); + if (_param._have_meta_predictor) + { + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", " in_BRANCH_COMPLETE_DIRECTION_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)); + } + } + + vhdl.set_body_component ("component_Meta_Predictor_Glue",_name+"_Meta_Predictor_Glue",list_port_map); + + // =====[ component_Two_Level_Branch_Predictor_2 ]==================== + + list_port_map.clear(); + log_printf(INFO,Meta_Predictor,"vhdl_body","Instanciation : component_Two_Level_Branch_Predictor_2"); + + // Instantiation + vhdl.set_body_component_port_map (list_port_map,"in_CLOCK","in_CLOCK"); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_VAL_"+toString(i)+" ", " in_PREDICT_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_ACK_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_2_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_ADDRESS_"+toString(i)+" ", " in_PREDICT_ADDRESS_"+toString(i)); + if (_param._predictor_2_have_bht) + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_BHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i)); + if (_param._predictor_2_have_pht) + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_PHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i)); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)); + else + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", " in_BRANCH_COMPLETE_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_ACK_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_ADDRESS_"+toString(i)+" ", " in_BRANCH_COMPLETE_ADDRESS_"+toString(i)); + if (_param._predictor_2_have_bht) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_BHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY_"+toString(i)); + if (_param._predictor_2_have_pht) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_PHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY_"+toString(i)); + if (_param._have_meta_predictor) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)); + else + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", " in_BRANCH_COMPLETE_DIRECTION_"+toString(i)); + } + + vhdl.set_body_component ("component_Two_Level_Branch_Predictor_2",_name+"_Two_Level_Branch_Predictor_2",list_port_map); + + if (_param._have_meta_predictor) + { + // =====[ component_Two_Level_Branch_Predictor_1 ]==================== + + list_port_map.clear(); + log_printf(INFO,Meta_Predictor,"vhdl_body","Instanciation : component_Two_Level_Branch_Predictor_1"); + + // Instantiation + vhdl.set_body_component_port_map (list_port_map,"in_CLOCK","in_CLOCK"); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_VAL_"+toString(i)+" ", " in_PREDICT_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_ACK_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_1_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_ADDRESS_"+toString(i)+" ", " in_PREDICT_ADDRESS_"+toString(i)); + if (_param._predictor_1_have_bht) + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_BHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i)); + if (_param._predictor_1_have_pht) + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_PHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i)); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", " in_BRANCH_COMPLETE_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_ACK_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_ADDRESS_"+toString(i)+" ", " in_BRANCH_COMPLETE_ADDRESS_"+toString(i)); + if (_param._predictor_1_have_bht) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_BHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY_"+toString(i)); + if (_param._predictor_1_have_pht) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_PHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", " in_BRANCH_COMPLETE_DIRECTION_"+toString(i)); + } + + vhdl.set_body_component ("component_Two_Level_Branch_Predictor_1",_name+"_Two_Level_Branch_Predictor_1",list_port_map); + + // =====[ component_Two_Level_Branch_Predictor_0 ]==================== + + list_port_map.clear(); + log_printf(INFO,Meta_Predictor,"vhdl_body","Instanciation : component_Two_Level_Branch_Predictor_0"); + + // Instantiation + vhdl.set_body_component_port_map (list_port_map,"in_CLOCK","in_CLOCK"); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_VAL_"+toString(i)+" ", " in_PREDICT_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_ACK_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_0_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_PREDICT_ADDRESS_"+toString(i)+" ", " in_PREDICT_ADDRESS_"+toString(i)); + if (_param._predictor_0_have_bht) + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_BHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i)); + if (_param._predictor_0_have_pht) + vhdl.set_body_component_port_map (list_port_map,"out_PREDICT_PHT_HISTORY_"+toString(i)+" ", "signal_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i)); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", " in_BRANCH_COMPLETE_VAL_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map,"out_BRANCH_COMPLETE_ACK_"+toString(i)+" ", "signal_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_ADDRESS_"+toString(i)+" ", " in_BRANCH_COMPLETE_ADDRESS_"+toString(i)); + if (_param._predictor_0_have_bht) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_BHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY_"+toString(i)); + if (_param._predictor_0_have_pht) + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_PHT_HISTORY_"+toString(i)+"", "signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY_"+toString(i)); + vhdl.set_body_component_port_map (list_port_map," in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", " in_BRANCH_COMPLETE_DIRECTION_"+toString(i)); + } + + vhdl.set_body_component ("component_Two_Level_Branch_Predictor_0",_name+"_Two_Level_Branch_Predictor_0",list_port_map); + } + + log_printf(FUNC,Meta_Predictor,"vhdl_body","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp (revision 5) @@ -0,0 +1,86 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl_declaration (Vhdl & vhdl) + { + log_printf(FUNC,Meta_Predictor,"vhdl_declaration","Begin"); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + if (_param._have_meta_predictor) + { + vhdl.set_signal("signal_PREDICT_PREDICTOR_0_ACK_"+toString(i)+"", 1); + vhdl.set_signal("signal_PREDICT_PREDICTOR_1_ACK_"+toString(i)+"", 1); + } + vhdl.set_signal("signal_PREDICT_PREDICTOR_2_ACK_"+toString(i)+"", 1); + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + vhdl.set_signal("signal_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i)+"", _param._predictor_0_bht_size_shifter); + if (_param._predictor_0_have_pht) + vhdl.set_signal("signal_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i)+"", _param._predictor_0_pht_size_counter); + if (_param._predictor_1_have_bht) + vhdl.set_signal("signal_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i)+"", _param._predictor_1_bht_size_shifter); + if (_param._predictor_1_have_pht) + vhdl.set_signal("signal_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i)+"", _param._predictor_1_pht_size_counter); + } + if (_param._predictor_2_have_bht) + vhdl.set_signal("signal_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i)+"", _param._predictor_2_bht_size_shifter); + if (_param._predictor_2_have_pht) + vhdl.set_signal("signal_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i)+"", _param._predictor_2_pht_size_counter); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + if (_param._have_meta_predictor) + { + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+" ", 1); + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)+" ", 1); + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+" ", 1); + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+"", 1); + } + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)+" ", 1); + + if (_param._have_meta_predictor) + { + if (_param._predictor_0_have_bht) + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY_"+toString(i)+"", _param._predictor_0_bht_size_shifter); + if (_param._predictor_0_have_pht) + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY_"+toString(i)+"", _param._predictor_0_pht_size_counter); + if (_param._predictor_1_have_bht) + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY_"+toString(i)+"", _param._predictor_1_bht_size_shifter); + if (_param._predictor_1_have_pht) + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY_"+toString(i)+"", _param._predictor_1_pht_size_counter); + } + if (_param._predictor_2_have_bht) + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY_"+toString(i)+"", _param._predictor_2_bht_size_shifter); + if (_param._predictor_2_have_pht) + vhdl.set_signal("signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY_"+toString(i)+"", _param._predictor_2_pht_size_counter); + } + + + log_printf(FUNC,Meta_Predictor,"vhdl_declaration","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_port.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_port.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_port.cpp (revision 5) @@ -0,0 +1,51 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl_port (Vhdl & vhdl) + { + log_printf(FUNC,Meta_Predictor,"vhdl_port","Begin"); + + vhdl.set_port (" in_CLOCK" , IN, 1); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + vhdl.set_port (" in_PREDICT_VAL_"+toString(i)+" ", IN, 1); + vhdl.set_port ("out_PREDICT_ACK_"+toString(i)+" ",OUT, 1); + vhdl.set_port (" in_PREDICT_ADDRESS_"+toString(i)+" ", IN,_param._size_address); + vhdl.set_port ("out_PREDICT_HISTORY_"+toString(i)+" ",OUT,_param._size_history); + vhdl.set_port ("out_PREDICT_DIRECTION_"+toString(i)+" ",OUT,1); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + vhdl.set_port (" in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", IN, 1); + vhdl.set_port ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" ",OUT, 1); + vhdl.set_port (" in_BRANCH_COMPLETE_ADDRESS_"+toString(i)+" ", IN,_param._size_address); + vhdl.set_port (" in_BRANCH_COMPLETE_HISTORY_"+toString(i)+" ", IN,_param._size_history); + vhdl.set_port (" in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", IN, 1); + } + + log_printf(FUNC,Meta_Predictor,"vhdl_port","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_label.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_label.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_label.cpp (revision 5) @@ -0,0 +1,33 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl_testbench_label (string label) + { + log_printf(FUNC,Meta_Predictor,"vhdl_testbench_label","Begin"); + +#ifdef VHDL_TESTBENCH + _vhdl_testbench->add_label(label); +#endif + + log_printf(FUNC,Meta_Predictor,"vhdl_testbench_label","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_port.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_port.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_port.cpp (revision 5) @@ -0,0 +1,49 @@ +#ifdef VHDL_TESTBENCH +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl_testbench_port () + { + log_printf(FUNC,Meta_Predictor,"vhdl_testbench_port","Begin"); + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + _vhdl_testbench->set_port (" in_PREDICT_VAL_"+toString(i)+" ", IN, 1); + _vhdl_testbench->set_port ("out_PREDICT_ACK_"+toString(i)+" ",OUT, 1); + _vhdl_testbench->set_port (" in_PREDICT_ADDRESS_"+toString(i)+" ", IN,_param._size_address); + _vhdl_testbench->set_port ("out_PREDICT_HISTORY_"+toString(i)+" ",OUT,_param._size_history); + _vhdl_testbench->set_port ("out_PREDICT_DIRECTION_"+toString(i)+" ",OUT,1); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_VAL_"+toString(i)+" ", IN, 1); + _vhdl_testbench->set_port ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" ",OUT, 1); + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_ADDRESS_"+toString(i)+" ", IN,_param._size_address); + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_HISTORY_"+toString(i)+" ", IN,_param._size_history); + _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+" ", IN, 1); + } + + log_printf(FUNC,Meta_Predictor,"vhdl_testbench_port","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp (revision 5) @@ -0,0 +1,63 @@ +#ifdef VHDL_TESTBENCH +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Meta_Predictor::vhdl_testbench_transition () + { + log_printf(FUNC,Meta_Predictor,"vhdl_testbench_transition","Begin"); + + // Evaluation before read the ouput signal + sc_start(0); + + // In order with file Meta_Predictor_vhdl_testbench_port.cpp + // Warning : if a output depend of a subcomponent, take directly the port of subcomponent + // (because we have no control on the ordonnancer's policy) + + for (uint32_t i=0; i<_param._nb_prediction; i++) + { + _vhdl_testbench->add_input (PORT_READ( in_PREDICT_VAL [i])); + _vhdl_testbench->add_output(PORT_READ(out_PREDICT_ACK [i])); + _vhdl_testbench->add_input (PORT_READ( in_PREDICT_ADDRESS [i])); + _vhdl_testbench->add_output(PORT_READ(out_PREDICT_HISTORY [i])); + _vhdl_testbench->add_output(PORT_READ(out_PREDICT_DIRECTION [i])); + } + + for (uint32_t i=0; i<_param._nb_branch_complete; i++) + { + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_VAL [i])); + _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_ACK [i])); + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_ADDRESS [i])); + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_HISTORY [i])); + _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_DIRECTION [i])); + } + + // add_test : + // - True : the cycle must be compare with the output of systemC + // - False : no test + _vhdl_testbench->add_test(true); + + _vhdl_testbench->new_cycle (); // always at the end + + log_printf(FUNC,Meta_Predictor,"vhdl_testbench_transition","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters.cpp (revision 5) @@ -0,0 +1,251 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + Parameters::Parameters (bool have_meta_predictor , + + bool predictor_0_have_bht , + uint32_t predictor_0_bht_size_shifter , + uint32_t predictor_0_bht_nb_shifter , + bool predictor_0_have_pht , + uint32_t predictor_0_pht_size_counter , + uint32_t predictor_0_pht_nb_counter , + uint32_t predictor_0_pht_size_address_share, + + bool predictor_1_have_bht , + uint32_t predictor_1_bht_size_shifter , + uint32_t predictor_1_bht_nb_shifter , + bool predictor_1_have_pht , + uint32_t predictor_1_pht_size_counter , + uint32_t predictor_1_pht_nb_counter , + uint32_t predictor_1_pht_size_address_share, + + bool predictor_2_have_bht , + uint32_t predictor_2_bht_size_shifter , + uint32_t predictor_2_bht_nb_shifter , + bool predictor_2_have_pht , + uint32_t predictor_2_pht_size_counter , + uint32_t predictor_2_pht_nb_counter , + uint32_t predictor_2_pht_size_address_share, + + uint32_t size_address , + uint32_t nb_prediction , + uint32_t nb_branch_complete ): + _have_meta_predictor (have_meta_predictor ), + + _predictor_0_have_bht ((have_meta_predictor==false)?false:predictor_0_have_bht ), + _predictor_0_bht_size_shifter ((_predictor_0_have_bht==false)?0:predictor_0_bht_size_shifter ), + _predictor_0_bht_nb_shifter ((_predictor_0_have_bht==false)?0:predictor_0_bht_nb_shifter ), + _predictor_0_have_pht ((have_meta_predictor==false)?false:predictor_0_have_pht ), + _predictor_0_pht_size_counter ((_predictor_0_have_pht==false)?0:predictor_0_pht_size_counter ), + _predictor_0_pht_nb_counter ((_predictor_0_have_pht==false)?0:predictor_0_pht_nb_counter ), + _predictor_0_pht_size_address_share (predictor_0_pht_size_address_share), + + _predictor_1_have_bht ((have_meta_predictor==false)?false:predictor_1_have_bht ), + _predictor_1_bht_size_shifter ((_predictor_1_have_bht==false)?0:predictor_1_bht_size_shifter ), + _predictor_1_bht_nb_shifter ((_predictor_1_have_bht==false)?0:predictor_1_bht_nb_shifter ), + _predictor_1_have_pht ((have_meta_predictor==false)?false:predictor_1_have_pht ), + _predictor_1_pht_size_counter ((_predictor_1_have_pht==false)?0:predictor_1_pht_size_counter ), + _predictor_1_pht_nb_counter ((_predictor_1_have_pht==false)?0:predictor_1_pht_nb_counter ), + _predictor_1_pht_size_address_share (predictor_1_pht_size_address_share), + + _predictor_2_have_bht (predictor_2_have_bht ), + _predictor_2_bht_size_shifter ((_predictor_2_have_bht==false)?0:predictor_2_bht_size_shifter ), + _predictor_2_bht_nb_shifter ((_predictor_2_have_bht==false)?0:predictor_2_bht_nb_shifter ), + _predictor_2_have_pht (predictor_2_have_pht ), + _predictor_2_pht_size_counter ((_predictor_2_have_pht==false)?0:predictor_2_pht_size_counter ), + _predictor_2_pht_nb_counter ((_predictor_2_have_pht==false)?0:predictor_2_pht_nb_counter ), + _predictor_2_pht_size_address_share (predictor_2_pht_size_address_share), + + _size_address (size_address ), + _nb_prediction (nb_prediction ), + _nb_branch_complete (nb_branch_complete ), + + _size_history (_predictor_0_bht_size_shifter + _predictor_0_pht_size_counter + + _predictor_1_bht_size_shifter + _predictor_1_pht_size_counter + + _predictor_2_bht_size_shifter + _predictor_2_pht_size_counter ) + { + log_printf(FUNC,Meta_Predictor,"Parameters","Begin"); + + if (_have_meta_predictor) + { + _param_two_level_branch_predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht , + _predictor_0_bht_size_shifter , + _predictor_0_bht_nb_shifter , + _predictor_0_have_pht , + _predictor_0_pht_size_counter , + _predictor_0_pht_nb_counter , + _predictor_0_pht_size_address_share, + _size_address , + _nb_prediction , + _nb_branch_complete ); + + _param_two_level_branch_predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht , + _predictor_1_bht_size_shifter , + _predictor_1_bht_nb_shifter , + _predictor_1_have_pht , + _predictor_1_pht_size_counter , + _predictor_1_pht_nb_counter , + _predictor_1_pht_size_address_share, + _size_address , + _nb_prediction , + _nb_branch_complete ); + } + + _param_two_level_branch_predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht , + _predictor_2_bht_size_shifter , + _predictor_2_bht_nb_shifter , + _predictor_2_have_pht , + _predictor_2_pht_size_counter , + _predictor_2_pht_nb_counter , + _predictor_2_pht_size_address_share, + _size_address , + _nb_prediction , + _nb_branch_complete ); + + + _param_meta_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor , + _predictor_0_have_bht , + _predictor_0_bht_size_shifter , + _predictor_0_have_pht , + _predictor_0_pht_size_counter , + _predictor_1_have_bht , + _predictor_1_bht_size_shifter , + _predictor_1_have_pht , + _predictor_1_pht_size_counter , + _predictor_2_have_bht , + _predictor_2_bht_size_shifter , + _predictor_2_have_pht , + _predictor_2_pht_size_counter , + _nb_prediction , + _nb_branch_complete ); + + test(); + + log_printf(FUNC,Meta_Predictor,"Parameters","End"); + }; + + Parameters::Parameters (Parameters & param): + _have_meta_predictor (param._have_meta_predictor ), + + _predictor_0_have_bht (param._predictor_0_have_bht ), + _predictor_0_bht_size_shifter (param._predictor_0_bht_size_shifter ), + _predictor_0_bht_nb_shifter (param._predictor_0_bht_nb_shifter ), + _predictor_0_have_pht (param._predictor_0_have_pht ), + _predictor_0_pht_size_counter (param._predictor_0_pht_size_counter ), + _predictor_0_pht_nb_counter (param._predictor_0_pht_nb_counter ), + _predictor_0_pht_size_address_share (param._predictor_0_pht_size_address_share), + + _predictor_1_have_bht (param._predictor_1_have_bht ), + _predictor_1_bht_size_shifter (param._predictor_1_bht_size_shifter ), + _predictor_1_bht_nb_shifter (param._predictor_1_bht_nb_shifter ), + _predictor_1_have_pht (param._predictor_1_have_pht ), + _predictor_1_pht_size_counter (param._predictor_1_pht_size_counter ), + _predictor_1_pht_nb_counter (param._predictor_1_pht_nb_counter ), + _predictor_1_pht_size_address_share (param._predictor_1_pht_size_address_share), + + _predictor_2_have_bht (param._predictor_2_have_bht ), + _predictor_2_bht_size_shifter (param._predictor_2_bht_size_shifter ), + _predictor_2_bht_nb_shifter (param._predictor_2_bht_nb_shifter ), + _predictor_2_have_pht (param._predictor_2_have_pht ), + _predictor_2_pht_size_counter (param._predictor_2_pht_size_counter ), + _predictor_2_pht_nb_counter (param._predictor_2_pht_nb_counter ), + _predictor_2_pht_size_address_share (param._predictor_2_pht_size_address_share), + + _size_address (param._size_address ), + _nb_prediction (param._nb_prediction ), + _nb_branch_complete (param._nb_branch_complete ), + + _size_history (param._size_history ) + { + log_printf(FUNC,Meta_Predictor,"Parameters","Begin"); + + + if (_have_meta_predictor) + { + _param_two_level_branch_predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht , + _predictor_0_bht_size_shifter , + _predictor_0_bht_nb_shifter , + _predictor_0_have_pht , + _predictor_0_pht_size_counter , + _predictor_0_pht_nb_counter , + _predictor_0_pht_size_address_share, + _size_address , + _nb_prediction , + _nb_branch_complete ); + + _param_two_level_branch_predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht , + _predictor_1_bht_size_shifter , + _predictor_1_bht_nb_shifter , + _predictor_1_have_pht , + _predictor_1_pht_size_counter , + _predictor_1_pht_nb_counter , + _predictor_1_pht_size_address_share, + _size_address , + _nb_prediction , + _nb_branch_complete ); + } + + _param_two_level_branch_predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht , + _predictor_2_bht_size_shifter , + _predictor_2_bht_nb_shifter , + _predictor_2_have_pht , + _predictor_2_pht_size_counter , + _predictor_2_pht_nb_counter , + _predictor_2_pht_size_address_share, + _size_address , + _nb_prediction , + _nb_branch_complete ); + + _param_meta_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor , + _predictor_0_have_bht , + _predictor_0_bht_size_shifter , + _predictor_0_have_pht , + _predictor_0_pht_size_counter , + _predictor_1_have_bht , + _predictor_1_bht_size_shifter , + _predictor_1_have_pht , + _predictor_1_pht_size_counter , + _predictor_2_have_bht , + _predictor_2_bht_size_shifter , + _predictor_2_have_pht , + _predictor_2_pht_size_counter , + _nb_prediction , + _nb_branch_complete ); + + test(); + log_printf(FUNC,Meta_Predictor,"Parameters","End"); + }; + + Parameters::~Parameters () + { + log_printf(FUNC,Meta_Predictor,"~Parameters","Begin"); + + if (_have_meta_predictor) + { + delete _param_two_level_branch_predictor_0; + delete _param_two_level_branch_predictor_1; + } + delete _param_two_level_branch_predictor_2; + delete _param_meta_predictor_glue; + + log_printf(FUNC,Meta_Predictor,"~Parameters","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters_msg_error.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters_msg_error.cpp (revision 5) @@ -0,0 +1,49 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h" +#include +using namespace std; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + string Parameters::msg_error(void) + { + log_printf(FUNC,Meta_Predictor,"msg_error","Begin"); + + string msg = ""; + + // note : size_shifter and size_counter is set at 0 if not need + if ((8*sizeof(Thistory_t)) < _size_history) + { + msg += " - type \"Thistory_t\" is too little to the total size of history (shifter's size and counter's size)\n"; + msg += " * predictor_0_bht_size_shifter : " + toString(_predictor_0_bht_size_shifter) + "\n"; + msg += " * predictor_0_pht_size_counter : " + toString(_predictor_0_pht_size_counter) + "\n"; + msg += " * predictor_1_bht_size_shifter : " + toString(_predictor_1_bht_size_shifter) + "\n"; + msg += " * predictor_1_pht_size_counter : " + toString(_predictor_1_pht_size_counter) + "\n"; + msg += " * predictor_2_bht_size_shifter : " + toString(_predictor_2_bht_size_shifter) + "\n"; + msg += " * predictor_2_pht_size_counter : " + toString(_predictor_2_pht_size_counter) + "\n"; + msg += " * Thistory_t (bits): " + toString(8*(sizeof(Thistory_t))) + "\n"; + } + + return msg; + + log_printf(FUNC,Meta_Predictor,"msg_error","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters_print.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Parameters_print.cpp (revision 5) @@ -0,0 +1,145 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" +#include "Behavioural/include/XML.h" +using namespace std; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + string Parameters::print (uint32_t depth) + { + log_printf(FUNC,Meta_Predictor,"print","Begin"); + + uint32_t size_predictor_0 = _predictor_0_bht_size_shifter*_predictor_0_bht_nb_shifter+_predictor_0_pht_size_counter*_predictor_0_pht_nb_counter; + uint32_t size_predictor_1 = _predictor_1_bht_size_shifter*_predictor_1_bht_nb_shifter+_predictor_1_pht_size_counter*_predictor_1_pht_nb_counter; + uint32_t size_predictor_2 = _predictor_2_bht_size_shifter*_predictor_2_bht_nb_shifter+_predictor_2_pht_size_counter*_predictor_2_pht_nb_counter; + uint32_t size_predictor = size_predictor_0+size_predictor_1+size_predictor_2; + + XML xml ("meta_predictor"); + xml.balise_open("meta_predictor"); + + xml. text(""); + xml. comment("size predictor : "+toString(size_predictor )+" bits"); + xml. comment("size predictor_0 : "+toString(size_predictor_0)+" bits"); + xml. comment("size predictor_1 : "+toString(size_predictor_1)+" bits"); + xml. comment("size predictor_2 : "+toString(size_predictor_2)+" bits"); + xml. text(""); + + xml. singleton_begin("have_meta_predictor "); + xml. attribut("value",toString(_have_meta_predictor )); + xml. singleton_end(); + + xml. singleton_begin("predictor_0_have_bht "); + xml. attribut("value",toString(_predictor_0_have_bht )); + xml. singleton_end(); + xml. singleton_begin("predictor_0_bht_size_shifter "); + xml. attribut("value",toString(_predictor_0_bht_size_shifter )); + xml. singleton_end(); + xml. singleton_begin("predictor_0_bht_nb_shifter "); + xml. attribut("value",toString(_predictor_0_bht_nb_shifter )); + xml. singleton_end(); + xml. singleton_begin("predictor_0_have_pht "); + xml. attribut("value",toString(_predictor_0_have_pht )); + xml. singleton_end(); + xml. singleton_begin("predictor_0_pht_size_counter "); + xml. attribut("value",toString(_predictor_0_pht_size_counter )); + xml. singleton_end(); + xml. singleton_begin("predictor_0_pht_nb_counter "); + xml. attribut("value",toString(_predictor_0_pht_nb_counter )); + xml. singleton_end(); + xml. singleton_begin("predictor_0_pht_size_address_share"); + xml. attribut("value",toString(_predictor_0_pht_size_address_share)); + xml. singleton_end(); + + xml. singleton_begin("predictor_1_have_bht "); + xml. attribut("value",toString(_predictor_1_have_bht )); + xml. singleton_end(); + xml. singleton_begin("predictor_1_bht_size_shifter "); + xml. attribut("value",toString(_predictor_1_bht_size_shifter )); + xml. singleton_end(); + xml. singleton_begin("predictor_1_bht_nb_shifter "); + xml. attribut("value",toString(_predictor_1_bht_nb_shifter )); + xml. singleton_end(); + xml. singleton_begin("predictor_1_have_pht "); + xml. attribut("value",toString(_predictor_1_have_pht )); + xml. singleton_end(); + xml. singleton_begin("predictor_1_pht_size_counter "); + xml. attribut("value",toString(_predictor_1_pht_size_counter )); + xml. singleton_end(); + xml. singleton_begin("predictor_1_pht_nb_counter "); + xml. attribut("value",toString(_predictor_1_pht_nb_counter )); + xml. singleton_end(); + xml. singleton_begin("predictor_1_pht_size_address_share"); + xml. attribut("value",toString(_predictor_1_pht_size_address_share)); + xml. singleton_end(); + + xml. singleton_begin("predictor_2_have_bht "); + xml. attribut("value",toString(_predictor_2_have_bht )); + xml. singleton_end(); + xml. singleton_begin("predictor_2_bht_size_shifter "); + xml. attribut("value",toString(_predictor_2_bht_size_shifter )); + xml. singleton_end(); + xml. singleton_begin("predictor_2_bht_nb_shifter "); + xml. attribut("value",toString(_predictor_2_bht_nb_shifter )); + xml. singleton_end(); + xml. singleton_begin("predictor_2_have_pht "); + xml. attribut("value",toString(_predictor_2_have_pht )); + xml. singleton_end(); + xml. singleton_begin("predictor_2_pht_size_counter "); + xml. attribut("value",toString(_predictor_2_pht_size_counter )); + xml. singleton_end(); + xml. singleton_begin("predictor_2_pht_nb_counter "); + xml. attribut("value",toString(_predictor_2_pht_nb_counter )); + xml. singleton_end(); + xml. singleton_begin("predictor_2_pht_size_address_share"); + xml. attribut("value",toString(_predictor_2_pht_size_address_share)); + xml. singleton_end(); + + xml. singleton_begin("size_address "); + xml. attribut("value",toString(_size_address )); + xml. singleton_end(); + xml. singleton_begin("nb_prediction "); + xml. attribut("value",toString(_nb_prediction )); + xml. singleton_end(); + xml. singleton_begin("nb_branch_complete "); + xml. attribut("value",toString(_nb_branch_complete )); + xml. singleton_end(); + + if (_have_meta_predictor) + { + xml. text(_param_two_level_branch_predictor_0->print(depth+1)); + xml. text(_param_two_level_branch_predictor_1->print(depth+1)); + } + xml. text(_param_two_level_branch_predictor_2->print(depth+1)); + xml. text(_param_meta_predictor_glue ->print(depth+1)); + + xml.balise_close(); + + log_printf(FUNC,Meta_Predictor,"print","End"); + + return xml.get_body(depth); + }; + + ostream& operator<< (ostream& output_stream , + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters & x) + { + output_stream << x.print(0); + + return output_stream; + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch +}; // end namespace behavioural +}; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics.cpp (revision 5) @@ -0,0 +1,42 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + Statistics::Statistics (string name , + morpheo::behavioural::Parameters_Statistics parameters_statistics , + Parameters parameters + ) : + morpheo::behavioural::Statistics(name , + parameters_statistics ), + _parameters(parameters) + { + log_printf(FUNC,Meta_Predictor,"Statistics","Begin"); + log_printf(FUNC,Meta_Predictor,"Statistics","End"); + }; + + Statistics::~Statistics () + { + log_printf(FUNC,Meta_Predictor,"~Statistics","Begin"); + log_printf(FUNC,Meta_Predictor,"~Statistics","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_add.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_add.cpp (revision 5) @@ -0,0 +1,33 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" + +#include +using namespace std; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + void Statistics::add () + { + log_printf(FUNC,Meta_Predictor,"add","Begin"); + log_printf(FUNC,Meta_Predictor,"add","End"); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_print.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_print.cpp (revision 5) @@ -0,0 +1,58 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" + +#include +using namespace std; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + string Statistics::print (uint32_t depth, + string component_stat) + { + log_printf(FUNC,Meta_Predictor,"print","Begin"); + + string tab = string(depth,'\t'); + ostringstream msg; + + msg << tab << "" << endl + << print_body(depth+1) << endl + << component_stat + << tab << "" << endl; + + log_printf(FUNC,Meta_Predictor,"print","End"); + + return msg.str(); + }; + + string Statistics::print (uint32_t depth) + { + return print(depth,""); + }; + + ostream& operator<< (ostream& output_stream , + morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Statistics & x) + { + output_stream << x.print(0); + + return output_stream; + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_print_body.cpp (revision 5) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/src/Statistics_print_body.cpp (revision 5) @@ -0,0 +1,41 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" + +#include +using namespace std; + +namespace morpheo { +namespace behavioural { +namespace stage_1_ifetch { +namespace predictor { +namespace meta_predictor { + + + string Statistics::print_body (uint32_t depth) + { + log_printf(FUNC,Meta_Predictor,"print_body","Begin"); + + string tab = string(depth,'\t'); + ostringstream msg; + + msg << tab << ""; + + log_printf(FUNC,Meta_Predictor,"print_body","End"); + + return msg.str(); + }; + +}; // end namespace meta_predictor +}; // end namespace predictor +}; // end namespace stage_1_ifetch + +}; // end namespace behavioural +}; // end namespace morpheo +#endif