Ignore:
Timestamp:
Sep 25, 2018, 11:35:34 AM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
c6bbcdb
Parents:
341bb80 (diff), 7428ad9 (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 shared_library

File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    r341bb80 r6d44da1  
    9393host_triplet = @host@
    9494noinst_PROGRAMS =
     95@WITH_LIBFIBRE_TRUE@am__append_1 = \
     96@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
     97@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
     98
    9599subdir = benchmark
    96100ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    278282TIME_FORMAT = "%E"
    279283PRINT_FORMAT = %20s: #Comments needed for spacing
     284CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
     285        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
     286        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
     287        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
     288        ctxswitch-goroutine.run ctxswitch-java_thread.run \
     289        $(am__append_1)
    280290testdir = $(top_srcdir)/tests
    281291all: all-am
     
    470480
    471481
    472 .cfa.o: $(CFACC) $(CFACPP)
     482.cfa.o:
    473483        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    474484        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    475485        $(am__mv) $$depbase.Tpo $$depbase.Po
    476486
     487<<<<<<< HEAD
    477488.cfa.lo:
    478489        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     
    482493LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    483494
     495=======
     496>>>>>>> master
    484497.NOTPARALLEL:
    485498
     
    551564        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    552565
    553 ctxswitch$(EXEEXT): \
    554         loop.run                                \
    555         function.run                    \
    556         fetch_add.run                   \
    557         ctxswitch-pthread.run           \
    558         ctxswitch-cfa_coroutine.run     \
    559         ctxswitch-cfa_thread.run        \
    560         ctxswitch-cfa_thread2.run       \
    561         ctxswitch-upp_coroutine.run     \
    562         ctxswitch-upp_thread.run        \
    563         -ctxswitch-kos_fibre.run        \
    564         -ctxswitch-kos_fibre2.run       \
    565         ctxswitch-goroutine.run         \
    566         ctxswitch-java_thread.run
     566@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
     567@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     568
     569@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
     570@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     571
     572ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    567573
    568574ctxswitch-pthread$(EXEEXT):
     
    583589ctxswitch-upp_thread$(EXEEXT):
    584590        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    585 
    586 ctxswitch-kos_fibre$(EXEEXT):
    587         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    588 
    589 ctxswitch-kos_fibre2$(EXEEXT):
    590         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    591591
    592592ctxswitch-goroutine$(EXEEXT):
Note: See TracChangeset for help on using the changeset viewer.