Changeset f73f5f4 for src/benchmark


Ignore:
Timestamp:
Jul 12, 2017, 10:14:15 AM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
3268a58, 76f2bdcb
Parents:
f2b12406 (diff), 7812f1d1 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
src/benchmark
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/benchmark/Makefile.am

    rf2b12406 rf73f5f4  
    2020CC = @CFA_BINDIR@/@CFA_NAME@
    2121
    22 noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread
     22noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
    2323
    24 bench :
     24bench$(EXEEXT) :
    2525        @for ccflags in "-debug" "-nodebug"; do \
    2626                echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
    … …  
    3030        rm -f ./a.out ;
    3131
    32 ctxswitch-coroutine:
     32ctxswitch-coroutine$(EXEEXT):
    3333        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
    3434        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    3737        @rm -f ./a.out
    3838
    39 ctxswitch-thread:
     39ctxswitch-thread$(EXEEXT):
    4040        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
    4141        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    4444        @rm -f ./a.out
    4545
    46 sched-int:
     46sched-int$(EXEEXT):
    4747        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
    4848        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    5151        @rm -f ./a.out
    5252
    53 monitor:
     53monitor$(EXEEXT):
    5454        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
    5555        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    5858        @rm -f ./a.out
    5959
    60 csv-data:
     60csv-data$(EXEEXT):
    6161        @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
    6262        @./a.out

  • src/benchmark/Makefile.in

    rf2b12406 rf73f5f4  
    9292build_triplet = @build@
    9393host_triplet = @host@
    94 noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) \
    95         ctxswitch-thread$(EXEEXT)
    9694subdir = src/benchmark
    9795ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    108106bench_OBJECTS = bench.$(OBJEXT)
    109107bench_LDADD = $(LDADD)
     108csv_data_SOURCES = csv-data.c
     109csv_data_OBJECTS = csv-data.$(OBJEXT)
     110csv_data_LDADD = $(LDADD)
    110111ctxswitch_coroutine_SOURCES = ctxswitch-coroutine.c
    111112ctxswitch_coroutine_OBJECTS = ctxswitch-coroutine.$(OBJEXT)
    … …  
    114115ctxswitch_thread_OBJECTS = ctxswitch-thread.$(OBJEXT)
    115116ctxswitch_thread_LDADD = $(LDADD)
     117monitor_SOURCES = monitor.c
     118monitor_OBJECTS = monitor.$(OBJEXT)
     119monitor_LDADD = $(LDADD)
     120sched_int_SOURCES = sched-int.c
     121sched_int_OBJECTS = sched-int.$(OBJEXT)
     122sched_int_LDADD = $(LDADD)
    116123AM_V_P = $(am__v_P_@AM_V@)
    117124am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    142149am__v_CCLD_0 = @echo "  CCLD    " $@;
    143150am__v_CCLD_1 =
    144 SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
    145 DIST_SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
     151SOURCES = bench.c csv-data.c ctxswitch-coroutine.c ctxswitch-thread.c \
     152        monitor.c sched-int.c
     153DIST_SOURCES = bench.c csv-data.c ctxswitch-coroutine.c \
     154        ctxswitch-thread.c monitor.c sched-int.c
    146155am__can_run_installinfo = \
    147156  case $$AM_UPDATE_INFO_DIR in \
    … …  
    293302top_srcdir = @top_srcdir@
    294303AM_CFLAGS = -g -Wall -Wno-unused-function -O2
     304noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
    295305all: all-am
    296306
    … …  
    337347
    338348@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench.Po@am__quote@
     349@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csv-data.Po@am__quote@
    339350@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-coroutine.Po@am__quote@
    340351@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-thread.Po@am__quote@
     352@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor.Po@am__quote@
     353@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched-int.Po@am__quote@
    341354
    342355.c.o:
    … …  
    559572
    560573
    561 bench :
     574bench$(EXEEXT) :
    562575        @for ccflags in "-debug" "-nodebug"; do \
    563576                echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
    … …  
    567580        rm -f ./a.out ;
    568581
    569 ctxswitch-coroutine:
     582ctxswitch-coroutine$(EXEEXT):
    570583        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
    571584        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    574587        @rm -f ./a.out
    575588
    576 ctxswitch-thread:
     589ctxswitch-thread$(EXEEXT):
    577590        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
    578591        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    581594        @rm -f ./a.out
    582595
    583 sched-int:
     596sched-int$(EXEEXT):
    584597        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
    585598        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    588601        @rm -f ./a.out
    589602
    590 monitor:
     603monitor$(EXEEXT):
    591604        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
    592605        @for number in 1 2 3 4 5 6 7 8 9 10; do \
    … …  
    595608        @rm -f ./a.out
    596609
    597 csv-data:
     610csv-data$(EXEEXT):
    598611        @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
    599612        @./a.out
Note: See TracChangeset for help on using the changeset viewer.