Changeset 490db327 for src/benchmark


Ignore:
Timestamp:
Nov 15, 2017, 2:01:08 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
20632a2
Parents:
c95b115 (diff), 6d2386e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into unique-variable-renaming

Location:
src/benchmark
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • src/benchmark/Makefile.am

    rc95b115 r490db327  
    133133## =========================================================================================================
    134134creation$(EXEEXT) :\
    135         creation-pthread.run            \
    136         creation-cfa_coroutine.run      \
    137         creation-cfa_thread.run         \
    138         creation-upp_coroutine.run      \
     135        creation-pthread.run                    \
     136        creation-cfa_coroutine.run              \
     137        creation-cfa_coroutine_eager.run        \
     138        creation-cfa_thread.run                 \
     139        creation-upp_coroutine.run              \
    139140        creation-upp_thread.run
    140141
    … …  
    142143        ${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    143144
     145creation-cfa_coroutine_eager$(EXEEXT):
     146        ${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     147
    144148creation-cfa_thread$(EXEEXT):
    145149        ${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    … …  
    153157creation-pthread$(EXEEXT):
    154158        @BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     159
     160## =========================================================================================================
     161
     162compile$(EXEEXT) :\
     163        compile-array$(EXEEXT)          \
     164        compile-attributes$(EXEEXT)     \
     165        compile-empty$(EXEEXT)          \
     166        compile-expression$(EXEEXT)     \
     167        compile-io$(EXEEXT)             \
     168        compile-monitor$(EXEEXT)        \
     169        compile-operators$(EXEEXT)      \
     170        compile-thread$(EXEEXT)         \
     171        compile-typeof$(EXEEXT)
     172
     173
     174compile-array$(EXEEXT):
     175        @printf '%20s\t' $(subst compile-,,$@)
     176        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/array.c
     177
     178compile-attributes$(EXEEXT):
     179        @printf '%20s\t' $(subst compile-,,$@)
     180        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/attributes.c
     181
     182compile-empty$(EXEEXT):
     183        @printf '%20s\t' $(subst compile-,,$@)
     184        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w compile/empty.c
     185
     186compile-expression$(EXEEXT):
     187        @printf '%20s\t' $(subst compile-,,$@)
     188        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/expression.c
     189
     190compile-io$(EXEEXT):
     191        @printf '%20s\t' $(subst compile-,,$@)
     192        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/io.c
     193
     194compile-monitor$(EXEEXT):
     195        @printf '%20s\t' $(subst compile-,,$@)
     196        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/monitor.c
     197
     198compile-operators$(EXEEXT):
     199        @printf '%20s\t' $(subst compile-,,$@)
     200        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/operators.c
     201
     202compile-thread$(EXEEXT):
     203        @printf '%20s\t' $(subst compile-,,$@)
     204        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/thread.c
     205
     206compile-typeof$(EXEEXT):
     207        @printf '%20s\t' $(subst compile-,,$@)
     208        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/typeof.c
     209
    155210
    156211## =========================================================================================================

  • src/benchmark/Makefile.in

    rc95b115 r490db327  
    124124  esac
    125125am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    126 am__DIST_COMMON = $(srcdir)/Makefile.in
     126am__DIST_COMMON = $(srcdir)/Makefile.in compile
    127127DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    128128ACLOCAL = @ACLOCAL@
    … …  
    544544
    545545creation$(EXEEXT) :\
    546         creation-pthread.run            \
    547         creation-cfa_coroutine.run      \
    548         creation-cfa_thread.run         \
    549         creation-upp_coroutine.run      \
     546        creation-pthread.run                    \
     547        creation-cfa_coroutine.run              \
     548        creation-cfa_coroutine_eager.run        \
     549        creation-cfa_thread.run                 \
     550        creation-upp_coroutine.run              \
    550551        creation-upp_thread.run
    551552
    … …  
    553554        ${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    554555
     556creation-cfa_coroutine_eager$(EXEEXT):
     557        ${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     558
    555559creation-cfa_thread$(EXEEXT):
    556560        ${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    … …  
    564568creation-pthread$(EXEEXT):
    565569        @BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     570
     571compile$(EXEEXT) :\
     572        compile-array$(EXEEXT)          \
     573        compile-attributes$(EXEEXT)     \
     574        compile-empty$(EXEEXT)          \
     575        compile-expression$(EXEEXT)     \
     576        compile-io$(EXEEXT)             \
     577        compile-monitor$(EXEEXT)        \
     578        compile-operators$(EXEEXT)      \
     579        compile-thread$(EXEEXT)         \
     580        compile-typeof$(EXEEXT)         \
     581        compile-vector_test$(EXEEXT)
     582
     583compile-array$(EXEEXT):
     584        @printf '%20s\t' $(subst compile-,,$@)
     585        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/array.c
     586
     587compile-attributes$(EXEEXT):
     588        @printf '%20s\t' $(subst compile-,,$@)
     589        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/attributes.c
     590
     591compile-empty$(EXEEXT):
     592        @printf '%20s\t' $(subst compile-,,$@)
     593        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w compile/empty.c
     594
     595compile-expression$(EXEEXT):
     596        @printf '%20s\t' $(subst compile-,,$@)
     597        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/expression.c
     598
     599compile-io$(EXEEXT):
     600        @printf '%20s\t' $(subst compile-,,$@)
     601        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/io.c
     602
     603compile-monitor$(EXEEXT):
     604        @printf '%20s\t' $(subst compile-,,$@)
     605        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/monitor.c
     606
     607compile-operators$(EXEEXT):
     608        @printf '%20s\t' $(subst compile-,,$@)
     609        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/operators.c
     610
     611compile-thread$(EXEEXT):
     612        @printf '%20s\t' $(subst compile-,,$@)
     613        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/thread.c
     614
     615compile-typeof$(EXEEXT):
     616        @printf '%20s\t' $(subst compile-,,$@)
     617        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/typeof.c
     618
     619compile-vector_test$(EXEEXT):
     620        @printf '%20s\t' $(subst compile-,,$@)
     621        @/usr/bin/time -f "%E" ${CC} -quiet -fsyntax-only -w ../tests/vector_test.c
    566622
    567623%.run : %$(EXEEXT) ${REPEAT}

  • src/benchmark/creation/cfa_cor.c

    rc95b115 r490db327  
    55
    66coroutine MyCoroutine {};
    7 void ?{} (MyCoroutine & this) { prime(this); }
     7void ?{} (MyCoroutine & this) {
     8#ifdef EAGER
     9        prime(this);
     10#endif
     11}
    812void main(MyCoroutine & this) {}
    913
Note: See TracChangeset for help on using the changeset viewer.