Changeset 6d44da1 for benchmark/Makefile.in
- Timestamp:
- Sep 25, 2018, 11:35:34 AM (7 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
benchmark/Makefile.in
r341bb80 r6d44da1 93 93 host_triplet = @host@ 94 94 noinst_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 95 99 subdir = benchmark 96 100 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 278 282 TIME_FORMAT = "%E" 279 283 PRINT_FORMAT = %20s: #Comments needed for spacing 284 CTXSWITCH_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) 280 290 testdir = $(top_srcdir)/tests 281 291 all: all-am … … 470 480 471 481 472 .cfa.o: $(CFACC) $(CFACPP)482 .cfa.o: 473 483 $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ 474 484 $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ 475 485 $(am__mv) $$depbase.Tpo $$depbase.Po 476 486 487 <<<<<<< HEAD 477 488 .cfa.lo: 478 489 $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ … … 482 493 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/ 483 494 495 ======= 496 >>>>>>> master 484 497 .NOTPARALLEL: 485 498 … … 551 564 $(COMPILE) -DBENCH_N=500000000 fetch_add.c 552 565 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 572 ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND) 567 573 568 574 ctxswitch-pthread$(EXEEXT): … … 583 589 ctxswitch-upp_thread$(EXEEXT): 584 590 @$(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) -lfibre588 589 ctxswitch-kos_fibre2$(EXEEXT):590 @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre591 591 592 592 ctxswitch-goroutine$(EXEEXT):
Note: See TracChangeset
for help on using the changeset viewer.