Changeset 60 for sources/test_regression


Ignore:
Timestamp:
Feb 14, 2017, 11:30:19 AM (8 years ago)
Author:
meunier
Message:
  • Intégration des modifications de Clément, qui a intégré la version parallélisée de systemcass faite par Manuel.
Location:
sources/test_regression
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • sources/test_regression/02052006/system.cpp

    r55 r60  
    121121    sc_signal<bool> resetn("resetn");
    122122
     123    // Setup number of threads open-mp to 1 with the macro threads_omp()
     124    threads_omp();
     125
    123126    test test1("test1");
    124127    test1.clk(signal_clk);

  • sources/test_regression/04052005/system.cpp

    r55 r60  
    2323    e = 0x11;
    2424    f = 0x1A0;
     25
     26    // Setup number of threads open-mp to 1 with the macro threads_omp()
     27    threads_omp();
    2528
    2629    cout << "a = 0x" << hex << (unsigned int) a << " = " << a.to_string(SC_BIN) << "\n";

  • sources/test_regression/05092005/system.cpp

    r56 r60  
    2222    sc_clock signal_clk("my_clock", sc_time(1, sc_core::SC_NS));
    2323    sc_signal<bool> s[5];
     24
     25    // Setup number of threads open-mp to 1 with the macro threads_omp()
     26    threads_omp();
     27
    2428    hard a("a");
    2529    hard b("b");

  • sources/test_regression/07052005/system.cpp

    r56 r60  
    3939    i = e;
    4040
     41    // Setup number of threads open-mp to 1 with the macro threads_omp()
     42    threads_omp();
     43
    4144    cout << "a = 0x" << hex << (unsigned int) a << " = " << a.to_string(SC_BIN) << "\n";
    4245    //ASSERT(a.to_string(SC_BIN) == "0b000000111100010001");

  • sources/test_regression/07122006a/system.cpp

    r56 r60  
    1919    sc_signal<int> in ("in");
    2020    sc_signal<int> out("out");
     21
     22    // Setup number of threads open-mp to 1 with the macro threads_omp()
     23    threads_omp();
    2124
    2225    test test("test");

  • sources/test_regression/07122006b/system.cpp

    r55 r60  
    6565    sc_signal<int> out("out");
    6666
     67    // Setup number of threads open-mp to 1 with the macro threads_omp()
     68    threads_omp();
     69
    6770    test test("test");
    6871    test.clk(clk);

  • sources/test_regression/08092005/system.cpp

    r55 r60  
    4040    hard b("b");
    4141    hard c("c");
     42
     43    // Setup number of threads open-mp to 1 with the macro threads_omp()
     44    threads_omp();
    4245
    4346    a.clk(clk);

  • sources/test_regression/09092005a/system.cpp

    r56 r60  
    1414
    1515int sc_main (int argc, char ** argv) {
     16
     17    // Setup number of threads open-mp to 1 with the macro threads_omp()
     18    threads_omp();
    1619
    1720    sc_uint<ADDRSIZE> LINEADDR_MASK = ~(((sc_uint<ADDRSIZE>) ~0x0) >> (ADDRSIZE - OFFSETSIZE - BPFSIZE));

  • sources/test_regression/09092005b/system.cpp

    r55 r60  
    3939    hard b("b");
    4040    hard c("c");
     41
     42    // Setup number of threads open-mp to 1 with the macro threads_omp()
     43    threads_omp();
    4144
    4245    a.clk(clk1);

  • sources/test_regression/09092005c/system.cpp

    r56 r60  
    8282    top_level t("top_level");
    8383
     84    // Setup number of threads open-mp to 1 with the macro threads_omp()
     85    threads_omp();
     86
    8487    t.clk(clk);
    8588    t.o(out);

  • sources/test_regression/11062007/system.cpp

    r55 r60  
    104104    sc_signal<bool> s1("s1"),s2("s2"),s3("s3"),s4("s4"),s5("s5");
    105105
     106    // Setup number of threads open-mp to 1 with the macro threads_omp()
     107    threads_omp();
     108
    106109    A a("a");
    107110    B b("b");

  • sources/test_regression/14092005/system.cpp

    r56 r60  
    4848    sc_signal<int> s[10];
    4949    hard a("a");
     50
     51    // Setup number of threads open-mp to 1 with the macro threads_omp()
     52    threads_omp();
    5053
    5154    a.clk(clk1);

  • sources/test_regression/15042009a/system.cpp

    r55 r60  
    123123    top_level t("top_level");
    124124
     125    // Setup number of threads open-mp to 1 with the macro threads_omp()
     126    threads_omp();
     127
    125128    t.clk(clk);
    126129    t.o(out);

  • sources/test_regression/15042009b/system.cpp

    r55 r60  
    1717    a = ca;
    1818    b = cb;
     19
     20    // Setup number of threads open-mp to 1 with the macro threads_omp()
     21    threads_omp();
    1922
    2023    c = a & b;

  • sources/test_regression/15042009c/system.cpp

    r55 r60  
    3232    const long long int ca = 0xf00000000LLU;
    3333    a = ca;
     34
     35    // Setup number of threads open-mp to 1 with the macro threads_omp()
     36    threads_omp();
    3437
    3538    test_t<param_t> test1, test2;

  • sources/test_regression/15062006/system.cpp

    r55 r60  
    7777    sc_signal<int> s01("s01"), s02("s02"), s03("s03"), s04("s04");
    7878
     79    // Setup number of threads open-mp to 1 with the macro threads_omp()
     80    threads_omp();
     81
    7982    test<int> test1("test1");
    8083    test1.clk(signal_clk);

  • sources/test_regression/15092005a/system.cpp

    r55 r60  
    8989    top_level t("top_level");
    9090
     91    // Setup number of threads open-mp to 1 with the macro threads_omp()
     92    threads_omp();
     93
    9194    t.clk(clk);
    9295    t.o(out);

  • sources/test_regression/15092005b/system.cpp

    r55 r60  
    9292    top_level t("top_level");
    9393
     94    // Setup number of threads open-mp to 1 with the macro threads_omp()
     95    threads_omp();
     96
    9497    t.clk(clk);
    9598    t.o(out);

  • sources/test_regression/15092005c/system.cpp

    r55 r60  
    8787    top_level t("top_level");
    8888
     89    // Setup number of threads open-mp to 1 with the macro threads_omp()
     90    threads_omp();
     91
    8992    t.clk(clk);
    9093    t.o(out);

  • sources/test_regression/15092005d/system.cpp

    r55 r60  
    9090    top_level t("top_level");
    9191
     92    // Setup number of threads open-mp to 1 with the macro threads_omp()
     93    threads_omp();
     94
    9295    t.clk(clk);
    9396    t.o(out);

  • sources/test_regression/16022007/system.cpp

    r55 r60  
    213213        s15("s15");
    214214
     215    // Setup number of threads open-mp to 1 with the macro threads_omp()
     216    threads_omp();
    215217
    216218    M_0i1o a("a");

  • sources/test_regression/16062005a/system.cpp

    r55 r60  
    7575    }
    7676
     77    // Setup number of threads open-mp to 1 with the macro threads_omp()
     78    threads_omp();
     79
    7780    sc_clock clk("clock");
    7881    top_level1 top1("top1");

  • sources/test_regression/16062005b/system.cpp

    r55 r60  
    6565    }
    6666
     67    // Setup number of threads open-mp to 1 with the macro threads_omp()
     68    threads_omp();
     69
    6770    ofstream o;
    6871    o.open (argv[1], ios::out | ios::trunc);

  • sources/test_regression/16112005a/system.cpp

    r55 r60  
    4040    sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
    4141
     42    // Setup number of threads open-mp to 1 with the macro threads_omp()
     43    threads_omp();
     44
    4245    m.i1 (s1);
    4346    m.i2 (s1);

  • sources/test_regression/16112005b/system.cpp

    r55 r60  
    3838    sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
    3939
     40    // Setup number of threads open-mp to 1 with the macro threads_omp()
     41    threads_omp();
     42
    4043    m.i1(s1);
    4144    m.i3(s1);

  • sources/test_regression/16112005c/system.cpp

    r55 r60  
    3838    sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
    3939
     40    // Setup number of threads open-mp to 1 with the macro threads_omp()
     41    threads_omp();
     42
    4043    m.i1 (s1);
    4144    m.i2 (s1);

  • sources/test_regression/16122005/system.cpp

    r55 r60  
    6767    }
    6868
     69    // Setup number of threads open-mp to 1 with the macro threads_omp()
     70    threads_omp();
     71
    6972    sc_clock clk("clock");
    7073    top_level1 top1("top1");

  • sources/test_regression/17022006/system.cpp

    r55 r60  
    6969    sc_signal<char> s04_0("s04_0"), s04_1("s04_1"), s04_2("s04_2");
    7070
     71    // Setup number of threads open-mp to 1 with the macro threads_omp()
     72    threads_omp();
     73
    7174    test test1("test1");
    7275    test1.clk(signal_clk);

  • sources/test_regression/17032005/system.cpp

    r55 r60  
    7676    test.clk(clk);
    7777    test.resetn(resetn);
     78
     79    // Setup number of threads open-mp to 1 with the macro threads_omp()
     80    threads_omp();
    7881
    7982    sc_trace_file * tf;

  • sources/test_regression/19042005/system.cpp

    r55 r60  
    7878    sc_signal< sc_uint<64> > s11("s11"), s12("s12"), s13("s13");
    7979    sc_signal< sc_uint<32> > s16("s16");
     80
     81    // Setup number of threads open-mp to 1 with the macro threads_omp()
     82    threads_omp();
    8083
    8184    test test1("test1");

  • sources/test_regression/19122005/system.cpp

    r55 r60  
    127127    sc_clock  signal_clk("my_clock", 1, 0.5);
    128128
     129    // Setup number of threads open-mp to 1 with the macro threads_omp()
     130    threads_omp();
     131
    129132    test test1("test1");
    130133    test1.clk(signal_clk);

  • sources/test_regression/20122006/system.cpp

    r55 r60  
    226226        s15("s15");
    227227
     228    // Setup number of threads open-mp to 1 with the macro threads_omp()
     229    threads_omp();
    228230
    229231    M_0i1o a("a");

  • sources/test_regression/21062005/system.cpp

    r55 r60  
    4848    sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
    4949
     50    // Setup number of threads open-mp to 1 with the macro threads_omp()
     51    threads_omp();
     52
    5053    m.i1 (s1);
    5154    m.i2 (s1);

  • sources/test_regression/24082009/system.cpp

    r55 r60  
    4242    sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
    4343
     44    // Setup number of threads open-mp to 1 with the macro threads_omp()
     45    threads_omp();
     46
    4447    A a("a");
    4548    A b("b");

  • sources/test_regression/25032005/system.cpp

    r55 r60  
    103103    sc_signal<bool> s1("s1"), s2("s2"), s3("s3"), s4("s4"), s5("s5");
    104104
     105    // Setup number of threads open-mp to 1 with the macro threads_omp()
     106    threads_omp();
     107
    105108    A a("a");
    106109    B b("b");

  • sources/test_regression/28102005/system.cpp

    r55 r60  
    4747    sc_clock clk("clock");
    4848
     49    // Setup number of threads open-mp to 1 with the macro threads_omp()
     50    threads_omp();
     51
    4952    check_time(0);
    5053    sc_start(sc_time(0, sc_core::SC_NS));

  • sources/test_regression/29032005/system.cpp

    r55 r60  
    216216        s15("s15");
    217217
     218    // Setup number of threads open-mp to 1 with the macro threads_omp()
     219    threads_omp();
    218220
    219221    M_0i1o a("a");

  • sources/test_regression/30032005a/system.cpp

    r55 r60  
    119119        s15("s15");
    120120
     121    // Setup number of threads open-mp to 1 with the macro threads_omp()
     122    threads_omp();
    121123
    122124    M1_3i3o a("a");

  • sources/test_regression/30032005b/system.cpp

    r55 r60  
    7474        s15("s15");
    7575
     76    // Setup number of threads open-mp to 1 with the macro threads_omp()
     77    threads_omp();
    7678
    7779    M1_1i1o a("a");

  • sources/test_regression/30032005c/system.cpp

    r55 r60  
    108108        s15("s15");
    109109
     110    // Setup number of threads open-mp to 1 with the macro threads_omp()
     111    threads_omp();
    110112
    111113    M1_3i2o a("a");

  • sources/test_regression/test.h

    r55 r60  
     1
     2#ifdef _OPENMP
     3    #include <omp.h>
     4#endif
    15
    26#define ASSERT(x)                    \
    … …  
    812}
    913
     14#ifdef _OPENMP
     15    #define threads_omp()      \
     16    ({                         \
     17        omp_set_dynamic(false);\
     18        omp_set_num_threads(1);\
     19    })
     20#else
     21    #define threads_omp()
     22#endif
     23
Note: See TracChangeset for help on using the changeset viewer.