Changeset 62 for sources/src


Ignore:
Timestamp:
Feb 16, 2017, 3:46:11 PM (8 years ago)
Author:
meunier
Message:
  • Functional (or supposedly functional) OpenMP support configure must be run with --enable-use-omp and the topcell must define the USE_OPENMP flag before including the .h files of systemcass (if openmp enabled).
Location:
sources/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • sources/src/casc.h

    r60 r62  
    2121
    2222#include <cstdio>
    23 //#include <stdint.h>
    2423
    2524EXTERN char unstable;
    26 EXTERN int32 * pending_write_vector_nb;
     25EXTERN int32_t * pending_write_vector_nb;
     26#ifdef USE_OPENMP
    2727#pragma omp threadprivate (pending_write_vector_nb)
     28#endif
    2829
    2930namespace sc_core {

  • sources/src/dump_used_options.cc

    r52 r62  
    8989  "INIT_SIGNALS_TO_ZERO, "
    9090#endif
    91 #ifdef _OPENMP
    92   "_OPENMP, "
     91#ifdef USE_OPENMP
     92  "USE_OPENMP, "
    9393#endif
    9494  "...";

  • sources/src/gen_code.cc

    r61 r62  
    241241
    242242
    243 char * gen_scheduling_code_for_dynamic_link(method_process_list_t &
    244         transition_func_list,
    245         method_process_list_t &
    246         moore_func_list,
    247         strong_component_list_t *
    248         strongcomponents) {
     243char * gen_scheduling_code_for_dynamic_link(method_process_list_t & transition_func_list,
     244        method_process_list_t & moore_func_list,
     245        strong_component_list_t * strongcomponents) {
    249246    if (dump_stage) {
    250247        cerr << "Generating C code for scheduling...\n";
    … …  
    305302
    306303
    307 char * gen_scheduling_code_for_dynamic_link(method_process_list_t &
    308         transition_func_list,
    309         method_process_list_t &
    310         moore_func_list,
    311         ProcessDependencyList &
    312         mealy_func_list) {
     304char * gen_scheduling_code_for_dynamic_link(method_process_list_t & transition_func_list,
     305        method_process_list_t & moore_func_list,
     306        ProcessDependencyList & mealy_func_list) {
    313307    if (dump_stage) {
    314308        cerr << "Generating C code for scheduling...\n";
    … …  
    509503
    510504
    511 void gen_scheduling_code_for_static_func(method_process_list_t &
    512         transition_func_list,
    513         method_process_list_t &
    514         moore_func_list,
    515         ProcessDependencyList &
    516         mealy_func_list) {
     505void gen_scheduling_code_for_static_func(method_process_list_t & transition_func_list,
     506        method_process_list_t & moore_func_list,
     507        ProcessDependencyList & mealy_func_list) {
    517508    if (dump_stage) {
    518509        cerr << "Generating scheduling...\n";
    … …  
    546537    int n = fc.func_number;
    547538    int i;
    548 #pragma omp parallel for
    549539    for (i = 0; i < n; ++i) {
    550540#if 0
    … …  
    578568unsigned int nb_func[2];
    579569static method_process_t **func_list[2];
    580 #pragma omp threadprivate (nb_func, func_list)
    581570static strong_component_list_t quasistatic_list;
    582571
    583572unsigned long long busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml;
    584573unsigned long long last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml;
     574#ifdef USE_OPENMP
     575#pragma omp threadprivate (nb_func, func_list)
    585576#pragma omp threadprivate (busy_wait_f0, busy_wait_f1, busy_wait_up,busy_wait_ml)
    586577#pragma omp threadprivate (last_wait_f0, last_wait_f1, last_wait_up,last_wait_ml)
     578#endif
    587579
    588580static void Call(const method_process_t & m) {
    … …  
    621613unsigned int expected_globaltime = 0;
    622614volatile unsigned int globaltime __attribute__ ((aligned (128))) = 0;
     615#ifdef USE_OPENMP
     616#pragma omp threadprivate (expected_globaltime)
    623617#pragma omp shared (globaltime)
    624 #pragma omp threadprivate (expected_globaltime)
     618#endif
    625619
    626620unsigned int num_omp_threads;
    … …  
    644638        __asm volatile("lfence");
    645639    }
    646 
    647640#else
    648 #pragma omp barrier
     641    #ifdef USE_OPENMP
     642    #pragma omp barrier
     643    #endif
    649644#endif
    650645
    … …  
    664659    }
    665660#else
    666 #pragma omp barrier
     661    #ifdef USE_OPENMP
     662    #pragma omp barrier
     663    #endif
    667664#endif
    668665    if (!quasistatic_list.empty()) {
     666#ifdef USE_OPENMP
    669667#pragma omp master
     668#endif
    670669        {
    671670            quasistatic_mealy_generation();
    … …  
    682681        }
    683682#else
    684 #pragma omp barrier
    685 #endif
    686     }
    687 
    688 }
    689 
    690 
    691 void gen_scheduling_code_for_quasistatic_func(method_process_list_t &
    692         transition_func_list,
    693         method_process_list_t &
    694         moore_func_list,
    695         strong_component_list_t *
    696         mealy_func_list) {
     683    #ifdef USE_OPENMP
     684    #pragma omp barrier
     685    #endif
     686#endif
     687    }
     688}
     689
     690
     691void gen_scheduling_code_for_quasistatic_func(method_process_list_t & transition_func_list,
     692        method_process_list_t & moore_func_list,
     693        strong_component_list_t * mealy_func_list) {
    697694    if (dump_stage) {
    698695        cerr << "Generating quasi static scheduling...\n";

  • sources/src/gen_code.h

    r61 r62  
    106106    extern unsigned long long last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml;
    107107    extern unsigned int nb_func[2];
     108    extern unsigned int expected_globaltime;
     109    extern volatile unsigned int globaltime;
     110#ifdef USE_OPENMP
    108111#pragma omp threadprivate (busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml, nb_func)
    109112#pragma omp threadprivate (last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml)
    110     extern unsigned int expected_globaltime;
    111     extern volatile unsigned int globaltime;
     113#pragma omp threadprivate (expected_globaltime)
    112114#pragma omp shared (globaltime)
    113 #pragma omp threadprivate (expected_globaltime)
    114 
     115#endif
    115116    extern unsigned int num_omp_threads;
    116117
    117118
     119#ifdef USE_OPENMP
    118120#pragma omp parallel
     121#endif
    119122    {
    120 //        int cyclecount = number_of_cycles;
     123        int cyclecount = number_of_cycles;
    121124        busy_wait_f0 = busy_wait_f1 = busy_wait_up = busy_wait_ml = total_assig = 0;
    122125        last_wait_f0 = last_wait_f1 = last_wait_up = last_wait_ml = 0;
    123126
    124127        expected_globaltime = 0;
    125 #pragma omp master
     128#ifdef USE_OPENMP
     129#pragma omp master
     130#endif
    126131        {
    127132            globaltime = 0;
    128 #ifdef _OPENMP
     133#ifdef USE_OPENMP
    129134            num_omp_threads = omp_get_num_threads();
    130135#else
    … …  
    133138        }
    134139
     140#ifdef USE_OPENMP
    135141#pragma omp barrier
    136         // while (!((have_to_stop) | (cyclecount == 0))) {
    137         while (!((have_to_stop) || (number_of_cycles == 0))) {
    138 #pragma omp master
     142#endif
     143        while (!(have_to_stop || cyclecount == 0)) {
     144        //while (!(have_to_stop || number_of_cycles == 0)) {
     145#ifdef USE_OPENMP
     146#pragma omp master
     147#endif
    139148            {
    140149                trace_all(false);
    141150            }
    142151            internal_sc_cycle2();
    143 #pragma omp master
     152#ifdef USE_OPENMP
     153#pragma omp master
     154#endif
    144155            {
    145156                trace_all(true);
    146157            }
    147             // cyclecount = (number_of_cycles < 0) ? number_of_cycles : cyclecount - 1;
    148             number_of_cycles = (number_of_cycles < 0) ? number_of_cycles : number_of_cycles - 1;
    149         }
     158            cyclecount = (number_of_cycles < 0) ? number_of_cycles : cyclecount - 1;
     159            // number_of_cycles = (number_of_cycles < 0) ? number_of_cycles : number_of_cycles - 1;
     160        }
     161#ifdef USE_OPENMP
    150162#pragma omp barrier
     163#endif
    151164#if 0
    152 #ifdef _OPENMP
     165#ifdef USE_OPENMP
    153166#pragma omp critical
    154167        {
    … …  
    191204    if (is_posted_write()) {
    192205        // update posted value to external signals             
     206#ifdef USE_OPENMP
    193207#pragma omp parallel
     208#endif
    194209        update();
    195210        func_combinationals();
    … …  
    200215    // don't need to do func_combinationals since 'unstable' flag is now false
    201216    if (is_posted_write()) {
     217#ifdef USE_OPENMP
    202218#pragma omp parallel
     219#endif
    203220        update();
    204221        func_combinationals();

  • sources/src/global_functions.cc

    r60 r62  
    248248    assert(pending_write_vector_capacity != 0);
    249249
    250 #ifdef _OPENMP
    251 #define LINE_SIZE 128L
     250#ifdef USE_OPENMP
     251    #define LINE_SIZE 128L
    252252    int malloc_size = (sizeof (pending_write_t) * (pending_write_vector_capacity + 1) + (LINE_SIZE - 1)) & ~(LINE_SIZE - 1);
    253253    assert((sizeof(pending_write_t) * (pending_write_vector_capacity + 1)) <= malloc_size && "bad allocation size");
    254254
    255 #pragma omp parallel
     255    #pragma omp parallel
    256256    {
    257257        posix_memalign((void **) &pending_write_vector, LINE_SIZE, malloc_size);
    … …  
    263263#else
    264264    pending_write_vector = (pending_write_vector_t) malloc(sizeof(pending_write_t) * pending_write_vector_capacity);
     265    pending_write_vector_nb = (int32_t *) malloc(sizeof(int32_t));
     266    *pending_write_vector_nb = 0;
    265267#endif
    266268

  • sources/src/sc_main.cc

    r61 r62  
    9090bool use_port_dependency  = false;
    9191
    92 #ifdef _OPENMP
     92#ifdef USE_OPENMP
    9393bool use_openmp = true;
    9494#else

  • sources/src/sc_module.cc

    r61 r62  
    131131    module = &mod;
    132132    dont_initialize = false;
    133 #ifdef _OPENMP
     133#ifdef USE_OPENMP
    134134    omp_threadnum = omp_get_thread_num();
    135135#endif

  • sources/src/sc_object.cc

    r59 r62  
    106106const char * sc_gen_unique_name(const char * basename_) {
    107107    string s;
    108     gen_name(basename_,s);
     108    gen_name(basename_, s);
    109109    const char * ret = strdup(s.c_str());
    110110    sc_core::allocated_names.push_back(ret);

  • sources/src/sc_port.cc

    r60 r62  
    5353    extern char unstable;
    5454    char unstable = 0; // not in sc_core namespace because dynamic link support C linkage only
    55     int32 * pending_write_vector_nb = 0;
     55    int32_t * pending_write_vector_nb = 0;
    5656    unsigned long long int total_assig = 0;
     57#ifdef USE_OPENMP
    5758#pragma omp threadprivate (pending_write_vector_nb, total_assig)
     59#endif
    5860}
    5961
    … …  
    6567const char * const sc_signal_base::kind_string = "sc_signal";
    6668
    67 unsigned int pending_write_vector_capacity = 512;
     69unsigned int pending_write_vector_capacity;
    6870pending_write_vector_t pending_write_vector = NULL;
     71#ifdef USE_OPENMP
    6972#pragma omp threadprivate (pending_write_vector)
     73#endif
    7074extern equi_list_t equi_list;
    7175
    … …  
    215219    void update() {
    216220#if defined(DUMP_STAGE)
    217             cerr << "Updating... ";
    218 #endif
    219             // stl vectors are too slow
    220             // memcopy is not better
    221             // signal table sorting doesn't give any better performance
     221        cerr << "Updating... ";
     222#endif
     223        // stl vectors are too slow
     224        // memcopy is not better
     225        // signal table sorting doesn't give any better performance
    222226#if defined(DUMP_STAGE)
    223             cerr << "(" << *pending_write_vector_nb
    224                 << " internal pending writings) ";
    225 #endif
    226             unsigned int i;
    227             for (i = 0; i < *pending_write_vector_nb; ++i) {
     227        cerr << "(" << *pending_write_vector_nb
     228            << " internal pending writings) ";
     229#endif
     230        unsigned int i;
     231        for (i = 0; i < *pending_write_vector_nb; ++i) {
    228232#define iter (sc_core::pending_write_vector[i])
    229233#ifdef CONFIG_DEBUG
    230                 if (iter.pointer == NULL) {
    231                     cerr << "Internal error : trying to apply a posted write from an unassigned signal/port\n";
    232                     exit (8);
    233                 }
     234            if (iter.pointer == NULL) {
     235                cerr << "Internal error : trying to apply a posted write from an unassigned signal/port\n";
     236                exit (8);
     237            }
    234238#endif
    235239#ifdef DUMP_SIGNAL_STATS
    236                 if (*(iter.pointer) == iter.value) {
    237                     unnecessary++;
    238                 }
    239                 counter[iter.pointer]++;
    240 #endif
    241                 *(iter.pointer) = iter.value;
     240            if (*(iter.pointer) == iter.value) {
     241                unnecessary++;
     242            }
     243            counter[iter.pointer]++;
     244#endif
     245            *(iter.pointer) = iter.value;
    242246#undef iter
    243             }
     247        }
    244248#ifdef DUMP_SIGNAL_STATS
    245             total_assig += *pending_write_vector_nb;
    246 #endif
    247             total_assig += *pending_write_vector_nb;
    248             *pending_write_vector_nb = 0;
     249        total_assig += *pending_write_vector_nb;
     250#endif
     251        total_assig += *pending_write_vector_nb;
     252        *pending_write_vector_nb = 0;
    249253
    250254#if defined(DUMP_STAGE)
    251             cerr << "done.\n";
    252 #endif
    253         }
     255        cerr << "done.\n";
     256#endif
     257    }
    254258
    255259} // end of extern "C"

  • sources/src/sc_port_ext.h

    r60 r62  
    295295    std::cerr << "write " << value_ << " on in/out port (writing into a signal) '" << name() << "'\n";
    296296#endif
    297   T *p = (T*)get_pointer();
    298   if (*p != value_) {
    299         *p = value_;
     297    T * p = (T *) get_pointer();
     298    if (*p != value_) {
     299        *p = value_;
    300300#ifndef USE_PORT_DEPENDENCY
    301         if (unstable == 0)
    302                 unstable = 1;
    303 #endif
    304   }
     301        if (unstable == 0) {
     302            unstable = 1;
     303        }
     304#endif
     305    }
    305306}
    306307

  • sources/src/sc_signal.h

    r60 r62  
    7070extern "C" int32_t * pending_write_vector_nb;
    7171extern "C" unsigned long long int total_assig;
     72#ifdef USE_OPENMP
    7273#pragma omp threadprivate(pending_write_vector_nb, total_assig)
     74#endif
    7375extern unsigned int pending_write_vector_capacity;
    74 
    7576extern pending_write_vector_t pending_write_vector;
     77#ifdef USE_OPENMP
    7678#pragma omp threadprivate(pending_write_vector)
     79#endif
    7780
    7881template < typename T >
    … …  
    282285#else
    283286    memset(&val, 0, sizeof(val));
     287    memset(&new_val, 0, sizeof(new_val));
    284288#endif
    285289}

  • sources/src/sc_time.cc

    r60 r62  
    5555
    5656uint64 nb_cycles = 0;
     57#ifdef USE_OPENMP
    5758#pragma omp threadprivate(nb_cycles)
     59#endif
    5860
    5961const sc_time SC_ZERO_TIME(0, SC_NS);

  • sources/src/sc_time.h

    r60 r62  
    1515
    1616#include <string>
    17 //#include <stdint.h>
    1817
    1918#include "sc_nbdefs.h"
    … …  
    4342
    4443extern uint64 nb_cycles;
     44#ifdef USE_OPENMP
    4545#pragma omp threadprivate(nb_cycles)
     46#endif
    4647
    4748inline double sc_simulation_time() {

  • sources/src/sc_ver.cc

    r52 r62  
    7878    "\n"
    7979    "                           Last change : " __DATE__ "\n"
     80#ifdef USE_OPENMP
     81    "            Compiled with OpenMP enabled\n"
     82#endif
    8083    "\n";
    8184

  • sources/src/schedulers.cc

    r61 r62  
    6464method_process_list_t * transition_func_list;
    6565method_process_list_t * moore_func_list;
     66#ifdef USE_OPENMP
    6667#pragma omp threadprivate(transition_func_list, moore_func_list)
     68#endif
    6769method_process_list_t combinational_func_list;
    6870/* ***************************** */
    … …  
    120122void sort_functions() {
    121123    method_process_list_t::const_iterator m;
     124#ifdef USE_OPENMP
    122125#pragma omp parallel
    123126#pragma omp critical
     127#endif
    124128    {
    125129        transition_func_list = new method_process_list_t;
    126130        moore_func_list = new method_process_list_t;
    127131        for (m = method_process_list.begin(); m != method_process_list.end(); ++m) {
    128 #ifdef _OPENMP
     132#ifdef USE_OPENMP
    129133            if ((*m)->omp_threadnum == omp_get_thread_num())
    130134#endif
    … …  
    189193        exit (24092004);
    190194    }
     195    delete s;
    191196    return sig_graph;
    192197}
    … …  
    229234
    230235    sort_functions();
     236#ifdef USE_OPENMP
    231237#pragma omp parallel
    232238#pragma omp critical
     239#endif
    233240    {
    234241        if (dump_funclist_info) {
    235 #ifdef _OPENMP
     242#ifdef USE_OPENMP
    236243            cerr << "Thread " << omp_get_thread_num() << "\n";
    237244#endif
    238245            cerr << "  Transition functions : " << *transition_func_list << "\n";
    239246            cerr << "  Moore generation functions : " << *moore_func_list << "\n";
     247#ifdef USE_OPENMP
    240248#pragma omp master
     249#endif
    241250            {
    242251                if (!combinational_func_list.empty()) {
    … …  
    247256
    248257    /* Schedule */
    249     switch (scheduling_method) {
    250         case BUCHMANN_SCHEDULING :
    251         {
    252             // Generate the scheduled code, compile and link.
    253             // Buchmann's thesis explains this scheduling method.
    254             // Uses port dependancies like Dr. Mouchard.
    255             ProcessDependencyList * process_list = BuchmannScheduling();
    256             if (dynamic_link_of_scheduling_code) {
    257                 base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
    258             }
    259             else {
    260                 gen_scheduling_code_for_static_func(*transition_func_list, *moore_func_list, *process_list);
    261             }
    262             break;
     258        switch (scheduling_method) {
     259            case BUCHMANN_SCHEDULING :
     260            {
     261                // Generate the scheduled code, compile and link.
     262                // Buchmann's thesis explains this scheduling method.
     263                // Uses port dependancies like Dr. Mouchard.
     264                ProcessDependencyList * process_list = BuchmannScheduling();
     265                if (dynamic_link_of_scheduling_code) {
     266                    base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
     267                }
     268                else {
     269                    gen_scheduling_code_for_static_func(*transition_func_list, *moore_func_list, *process_list);
     270                }
     271                break;
     272            }
     273
     274            case MOUCHARD_SCHEDULING :
     275            {
     276                // Generate the scheduled code, compile and link.
     277                // Mouchard's thesis explains this scheduling method.
     278                // Uses port dependancies like Dr. Mouchard.
     279                // CAUTION : unlike FastSysC, this scheduling is totally static
     280                // and does not use an event-driven scheduler.
     281                ProcessDependencyList * process_list = MouchardScheduling();
     282                if (dynamic_link_of_scheduling_code) {
     283                    base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
     284                }
     285                else {
     286                    gen_scheduling_code_for_static_func (*transition_func_list, *moore_func_list, *process_list);
     287                }
     288                break;
     289            }
     290
     291            case CASS_SCHEDULING :
     292            {
     293                // Generate the scheduled code, compile and link
     294                // Hommais's thesis explains this scheduling method (like CASS strategy)
     295                // Doesn't use port dependancies
     296                strong_component_list_t * strong_list = NULL;
     297#ifdef USE_OPENMP
     298#pragma omp master
     299#endif
     300                {
     301                    Graph * g = makegraph (&combinational_func_list);
     302                    if (dump_all_graph && g) {
     303                        graph2dot("module_graph", *g);
     304                    }
     305                    strong_list = strong_component(g);
     306                }
     307                if (dynamic_link_of_scheduling_code) {
     308                    base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, strong_list);
     309                }
     310                else {
     311                    gen_scheduling_code_for_quasistatic_func (*transition_func_list, *moore_func_list, strong_list);
     312                }
     313                // free the void_lists in strong_list
     314                //for ( strong_component_list_t::iterator i = strong_list->begin(); i < strong_list->end(); i++) {
     315                //    delete *i;
     316                //}
     317#ifdef USE_OPENMP
     318#pragma omp master
     319#endif
     320                {
     321                    delete strong_list;
     322                }
     323                break;
     324            }
     325            default :
     326                cerr << "Error : Unable to schedule SystemC process."
     327                    "Please select a scheduling method.\n";
     328                exit (35);
    263329        }
    264 
    265         case MOUCHARD_SCHEDULING :
    266         {
    267             // Generate the scheduled code, compile and link.
    268             // Mouchard's thesis explains this scheduling method.
    269             // Uses port dependancies like Dr. Mouchard.
    270             // CAUTION : unlike FastSysC, this scheduling is totally static
    271             // and does not use an event-driven scheduler.
    272             ProcessDependencyList * process_list = MouchardScheduling();
    273             if (dynamic_link_of_scheduling_code) {
    274                 base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
    275             }
    276             else {
    277                 gen_scheduling_code_for_static_func (*transition_func_list, *moore_func_list, *process_list);
    278             }
    279             break;
    280         }
    281 
    282         case CASS_SCHEDULING :
    283         {
    284             // Generate the scheduled code, compile and link
    285             // Hommais's thesis explains this scheduling method (like CASS strategy)
    286             // Doesn't use port dependancies
    287             strong_component_list_t * strong_list = NULL;
    288 #pragma omp master
    289             {
    290                 Graph * g = makegraph (&combinational_func_list);
    291                 if (dump_all_graph && g) {
    292                     graph2dot("module_graph", *g);
    293                 }
    294                 strong_list = strong_component(g);
    295             }
    296             if (dynamic_link_of_scheduling_code) {
    297                 base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, strong_list);
    298             }
    299             else {
    300                 gen_scheduling_code_for_quasistatic_func (*transition_func_list, *moore_func_list, strong_list);
    301             }
    302             break;
    303         }
    304         default :
    305             cerr << "Error : Unable to schedule SystemC process."
    306                     "Please select a scheduling method.\n";
    307             exit (35);
    308     }
    309330    }
    310331    return base_name;
Note: See TracChangeset for help on using the changeset viewer.