Skip to content

Commit

Permalink
Added a variable to add an affinity mask when required.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.eiffel.com/eiffelstudio/trunk@98148 8089f293-4706-0410-a29e-feb5c42a2edf
  • Loading branch information
kwaxer committed Nov 27, 2015
1 parent 4f43ba8 commit cf51a5f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions benchmarks/scoop/bin/Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ EWEASEL_OUTPUT=$(MAKEDIR)\..\output
PROCESSORS=0
!ENDIF

!IFDEF AFFINITY
SPACE=
COMMAND_PREFIX=cmd /c start /w /affinity $(AFFINITY) $(SPACE)
!ENDIF

DO_MAKE=$(MAKE) -nologo -f Makefile.win

EXE=.exe
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/scoop/bin/makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TOP=..

ELAPSED_TIME_DIR=$(TOP)/../tool/elapsed_time
ELAPSED_TIME=$(ELAPSED_TIME_DIR)/EIFGENs/elapsed_time/F_code/elapsed_time$(EXE)
MEASURE="$(ELAPSED_TIME)" -nologo -skip_first 1 -f c -p $(PROCESSORS)
MEASURE="$(ELAPSED_TIME)" -nologo -skip_first 1 -f c

benchmark benchmark_1::
$(DO_MAKE) action.echo "MESSAGE=Name,Processors,Count,Minimum (ms),Maximum (ms),Average (ms),Standard deviation (ms),Command,Directory,Skip first count,Skip maximum count"
Expand Down Expand Up @@ -56,10 +56,10 @@ winnow:
$(DO_MAKE) action.$(ACTION) TARGET=$@ TEST=bench014 ARGUMENT="-i $(EWEASEL_OUTPUT)/bench014/EIFGENs/test/F_code/test.in -bench" "REPEAT=-c 18"

action.benchmark: $(ELAPSED_TIME) action.build
$(MEASURE) -w "$(EWEASEL_OUTPUT)/$(TEST)" -n $(TARGET) $(REPEAT) "$(EWEASEL_OUTPUT)/$(TEST)/EIFGENs/test/F_code/test$(EXE) $(ARGUMENT)" >> "$(OUTPUT)"
$(MEASURE) -w "$(EWEASEL_OUTPUT)/$(TEST)" -n $(TARGET) $(REPEAT) "$(COMMAND_PREFIX)$(EWEASEL_OUTPUT)/$(TEST)/EIFGENs/test/F_code/test$(EXE) $(ARGUMENT)" >> "$(OUTPUT)"

action.benchmark_1: $(ELAPSED_TIME) action.build
$(MEASURE) -w "$(EWEASEL_OUTPUT)/$(TEST)" -n $(TARGET) -c 1 "$(EWEASEL_OUTPUT)/$(TEST)/EIFGENs/test/F_code/test$(EXE) $(ARGUMENT)" >> "$(OUTPUT)"
$(MEASURE) -w "$(EWEASEL_OUTPUT)/$(TEST)" -n $(TARGET) -c 1 "$(COMMAND_PREFIX)$(EWEASEL_OUTPUT)/$(TEST)/EIFGENs/test/F_code/test$(EXE) $(ARGUMENT)" >> "$(OUTPUT)"

action.build: $(EWEASEL_OUTPUT)/$(TEST)/EIFGENs/test/F_code/test$(EXE)

Expand Down

0 comments on commit cf51a5f

Please sign in to comment.