Changeset 6e540ea


Ignore:
Timestamp:
Jan 8, 2020, 1:38:30 PM (21 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
4eb07bc
Parents:
580c11b
git-author:
Peter A. Buhr <pabuhr@…> (01/08/20 13:37:09)
git-committer:
Peter A. Buhr <pabuhr@…> (01/08/20 13:38:30)
Message:

additional corrections to harmonize with last benchmark update

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r580c11b r6e540ea  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Jan  7 17:01:01 2020
    14 ## Update Count     : 103
     13## Last Modified On : Tue Jan  7 21:04:53 2020
     14## Update Count     : 105
    1515###############################################################################
    1616
     
    3131BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    3232BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
     33BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
    3334BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    3435
     
    4748__bench_v_GOC_verbose = $(AM_V_GOC)
    4849__bench_v_RUSTC_verbose = $(AM_V_RUSTC)
     50__bench_v_NODEJS_verbose = $(AM_V_NODEJS)
    4951__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    5052
     
    7072        echo "int main() { return 0; }" > ${@}
    7173
    72 .SILENT:
    73 .ONESHELL:
     74.SILENT:                # do not print recipe
     75.ONESHELL:              # use one shell to execute recipe
    7476.NOTPARALLEL:
    7577.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv signal.csv
  • benchmark/Makefile.in

    r580c11b r6e540ea  
    358358am__v_CFA_0 = @echo "  CFA     " $@;
    359359am__v_CFA_1 =
    360 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    361 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    362 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    363 am__v_JAVAC_1 =
    364 AM_V_GOC = $(am__v_GOC_@AM_V@)
    365 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    366 am__v_GOC_0 = @echo "  GOC     " $@;
    367 am__v_GOC_1 =
    368360UPPCC = u++
    369361UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     
    372364am__v_UPP_0 = @echo "  UPP     " $@;
    373365am__v_UPP_1 =
     366AM_V_GOC = $(am__v_GOC_@AM_V@)
     367am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     368am__v_GOC_0 = @echo "  GOC     " $@;
     369am__v_GOC_1 =
     370AM_V_RUST = $(am__v_RUST_@AM_V@)
     371am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
     372am__v_RUST_0 = @echo "  RUST     " $@;
     373am__v_RUST_1 =
     374AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
     375am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
     376am__v_NODEJS_0 = @echo "  NODEJS     " $@;
     377am__v_NODEJS_1 =
     378AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     379am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     380am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     381am__v_JAVAC_1 =
    374382
    375383# applies to both programs
     
    383391BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    384392BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
     393BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
    385394BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    386395__quiet = verbose
     
    398407__bench_v_GOC_verbose = $(AM_V_GOC)
    399408__bench_v_RUSTC_verbose = $(AM_V_RUSTC)
     409__bench_v_NODEJS_verbose = $(AM_V_NODEJS)
    400410__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    401411TOOLSDIR = ${abs_top_builddir}/tools/
     
    746756        echo "int main() { return 0; }" > ${@}
    747757
    748 .SILENT:
    749 .ONESHELL:
     758.SILENT:                # do not print recipe
     759.ONESHELL:              # use one shell to execute recipe
    750760.NOTPARALLEL:
    751761.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv signal.csv
  • benchmark/creation/JavaThread.java

    r580c11b r6e540ea  
    3333        }
    3434        public static void helper() throws InterruptedException {
    35                 for(int i = 1; i <= NoOfTimes; i += 1) {
     35                for(int i = 1; i <= times; i += 1) {
    3636                        MyThread m = new MyThread();
    3737                        x = nextRandom( x );
     
    4444                helper();
    4545                long end = System.nanoTime();
    46                 System.out.println( (end - start) / NoOfTimes );
     46                System.out.println( (end - start) / times );
    4747        }
    4848        public static void main(String[] args) throws InterruptedException {
     
    5252                for (int i = Integer.parseInt("5"); --i >= 0 ; ) {
    5353                        InnerMain();
    54                         Thread.sleep(2000);     // 2 seconds
     54                        Thread.sleep(2000);             // 2 seconds
    5555                        x = nextRandom(x);
    5656                }
  • benchmark/schedint/cfa1.cfa

    r580c11b r6e540ea  
    1919        go = 1;
    2020        BENCH(
    21                 for ( i; n ) {
     21                for ( i; times ) {
    2222                        wait(c);
    2323                },
  • benchmark/schedint/cfa2.cfa

    r580c11b r6e540ea  
    1919        go = 1;
    2020        BENCH(
    21                 for ( i; n ) {
     21                for ( i; times ) {
    2222                        wait(c);
    2323                },
  • benchmark/schedint/cfa4.cfa

    r580c11b r6e540ea  
    1919        go = 1;
    2020        BENCH(
    21                 for ( i; n ) {
     21                for ( i; times ) {
    2222                        wait(c);
    2323                },
  • benchmark/schedint/upp.cc

    r580c11b r6e540ea  
    1515                go = 1;
    1616                BENCH(
    17                         for (size_t i = 0; i < n; i++) {
     17                        for (size_t i = 0; i < times; i++) {
    1818                                cond.wait();
    1919                        },
  • src/cfa.make

    r580c11b r6e540ea  
    1 
    2 
    31CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    42LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     
    2119        $(am__mv) $$depbase.Tpo $$depbase.Plo
    2220
    23 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    24 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    25 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    26 am__v_JAVAC_1 =
    27 
    28 AM_V_GOC = $(am__v_GOC_@AM_V@)
    29 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    30 am__v_GOC_0 = @echo "  GOC     " $@;
    31 am__v_GOC_1 =
    32 
    3321UPPCC = u++
    3422UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     
    3826am__v_UPP_0 = @echo "  UPP     " $@;
    3927am__v_UPP_1 =
     28
     29AM_V_GOC = $(am__v_GOC_@AM_V@)
     30am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     31am__v_GOC_0 = @echo "  GOC     " $@;
     32am__v_GOC_1 =
     33
     34AM_V_RUST = $(am__v_RUST_@AM_V@)
     35am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
     36am__v_RUST_0 = @echo "  RUST     " $@;
     37am__v_RUST_1 =
     38
     39AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
     40am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
     41am__v_NODEJS_0 = @echo "  NODEJS     " $@;
     42am__v_NODEJS_1 =
     43
     44AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     45am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     46am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     47am__v_JAVAC_1 =
Note: See TracChangeset for help on using the changeset viewer.