Skip to content

Commit

Permalink
Leave out the SingleSource/UnitTests directory in benchmarking only mode
Browse files Browse the repository at this point in the history
There is no need to go through the pain and maintain the
PROGRAMS_TO_SKIP variable in all the Makefiles in unittest directories
when we can simply leave out the whole directory.

llvm-svn: 242961
  • Loading branch information
MatzeB committed Jul 22, 2015
1 parent 0c48b78 commit 5945aab
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 120 deletions.
2 changes: 2 additions & 0 deletions MultiSource/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

LEVEL = ..
PARALLEL_DIRS := Applications Benchmarks
ifndef BENCHMARKING_ONLY
PARALLEL_DIRS += UnitTests
endif

include $(LEVEL)/Makefile.programs

4 changes: 0 additions & 4 deletions MultiSource/UnitTests/C++11/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ LEVEL = ../../..
PARALLEL_DIRS := frame_layout
CPPFLAGS += -std=c++11

ifdef BENCHMARKING_ONLY
PARALLEL_DIRS := $(filter-out frame_layout, $(PARALLEL_DIRS))
endif

ifneq (,$(findstring mips16,$(MIPSARCH)))
PARALLEL_DIRS := $(filter-out frame_layout, $(PARALLEL_DIRS))
endif
Expand Down
5 changes: 4 additions & 1 deletion SingleSource/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
LEVEL = ..

PARALLEL_DIRS := UnitTests Regression Benchmarks
PARALLEL_DIRS := Regression Benchmarks
ifndef BENCHMARKING_ONLY
PARALLEL_DIRS += UnitTests
endif

LDFLAGS += -lm

Expand Down
91 changes: 0 additions & 91 deletions SingleSource/UnitTests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,96 +58,5 @@ PROGRAMS_TO_SKIP += initp1
XCORE_TARGET_NEEDS_MEMORY := 1
endif

ifdef BENCHMARKING_ONLY
PROGRAMS_TO_SKIP += \
2002-04-17-PrintfChar \
2002-05-02-ArgumentTest \
2002-05-02-CastTest \
2002-05-02-CastTest1 \
2002-05-02-CastTest2 \
2002-05-02-CastTest3 \
2002-05-02-ManyArguments \
2002-05-03-NotTest \
2002-05-19-DivTest \
2002-08-02-CastTest \
2002-08-02-CastTest2 \
2002-08-19-CodegenBug \
2002-10-09-ArrayResolution \
2002-10-12-StructureArgs \
2002-10-12-StructureArgsSimple \
2002-10-13-BadLoad \
2002-12-13-MishaTest \
2003-04-22-Switch \
2003-05-02-DependentPHI \
2003-05-07-VarArgs \
2003-05-12-MinIntProblem \
2003-05-14-AtExit \
2003-05-26-Shorts \
2003-05-31-CastToBool \
2003-05-31-LongShifts \
2003-07-06-IntOverflow \
2003-07-08-BitOpsTest \
2003-07-09-LoadShorts \
2003-07-09-SignedArgs \
2003-07-10-SignConversions \
2003-08-05-CastFPToUint \
2003-08-11-VaListArg \
2003-08-20-FoldBug \
2003-09-18-BitFieldTest \
2003-10-13-SwitchTest \
2003-10-29-ScalarReplBug \
2004-02-02-NegativeZero \
2004-06-20-StaticBitfieldInit \
2004-11-28-GlobalBoolLayout \
2005-05-11-Popcount-ffs-fls \
2005-05-12-Int64ToFP \
2005-05-13-SDivTwo \
2005-07-15-Bitfield-ABI \
2005-07-17-INT-To-FP \
2005-11-29-LongSwitch \
2006-01-23-UnionInit \
2006-01-29-SimpleIndirectCall \
2006-02-04-DivRem \
2006-12-01-float_varg \
2006-12-04-DynAllocAndRestore \
2006-12-07-Compare64BitConstant \
2006-12-11-LoadConstants \
2007-01-04-KNR-Args \
2007-03-02-VaCopy \
2007-04-10-BitfieldTest \
2007-04-25-weak \
2008-04-18-LoopBug \
2008-04-20-LoopBug2 \
2008-07-13-InlineSetjmp \
2009-04-16-BitfieldInitialization \
2009-12-07-StructReturn \
2010-05-24-BitfieldTest \
AtomicOps \
block-byref-cxxobj-test \
block-byref-test \
block-call-r7674133 \
block-copied-in-cxxobj \
block-copied-in-cxxobj-1 \
blockstret \
byval-alignment \
conditional-gnu-ext \
conditional-gnu-ext-cxx \
DefaultInitDynArrays \
FloatPrecision \
initp1 \
member-function-pointers \
printargs \
stmtexpr \
StructModifyTest \
TestLoop \
vla \
ms_struct-bitfield \
ms_struct-bitfield-1 \
ms_struct-bitfield-init \
ms_struct-bitfield-init-1 \
ms_struct_pack_layout \
ms_struct_pack_layout-1
endif

LDFLAGS += -lstdc++
include $(LEVEL)/SingleSource/Makefile.singlesrc
4 changes: 0 additions & 4 deletions SingleSource/UnitTests/SignlessTypes/Large/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,4 @@ EXEC_XFAILS = cast
endif
endif

ifdef BENCHMARKING_ONLY
PROGRAMS_TO_SKIP += cast
endif

include $(LEVEL)/SingleSource/Makefile.singlesrc
4 changes: 0 additions & 4 deletions SingleSource/UnitTests/SignlessTypes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,5 @@ SEED := $(shell date +%j)
# the same results regardless of whether you make clean or not.
RUN_OPTIONS := 31415926

ifdef BENCHMARKING_ONLY
PROGRAMS_TO_SKIP += cast2 cast-bug ccc div factor shr rem
endif

LDFLAGS += -lstdc++
include $(LEVEL)/SingleSource/Makefile.singlesrc
4 changes: 0 additions & 4 deletions SingleSource/UnitTests/Threads/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,4 @@ ifeq ($(TARGET_OS),Darwin)
PROGRAMS_TO_SKIP := tls 2010-12-08-tls
endif

ifdef BENCHMARKING_ONLY
PROGRAMS_TO_SKIP += 2010-12-08-tls tls
endif

include $(LEVEL)/SingleSource/Makefile.singlesrc
8 changes: 0 additions & 8 deletions SingleSource/UnitTests/Vector/Altivec/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,4 @@ TARGET_FLAGS += -maltivec
TEST_TARGET_FLAGS += -maltivec
LCCFLAGS += -maltivec

ifdef BENCHMARKING_ONLY
PROGRAMS_TO_SKIP += \
2007-01-07-lvsl-lvsr-Regression alti.sdot \
casts test1 \
extract insert ld lde ldl merge mult-even-odd \
pack perm splat st ste stl sum2s sums unpack
endif

include $(LEVEL)/SingleSource/Makefile.singlesrc
4 changes: 0 additions & 4 deletions SingleSource/UnitTests/Vector/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ RUNTIMELIMIT:=7200
endif
endif

ifdef BENCHMARKING_ONLY
PROGRAMS_TO_SKIP += build constpool divides simple sumarray sumarray-dbl
endif

include $(LEVEL)/SingleSource/Makefile.singlesrc


0 comments on commit 5945aab

Please sign in to comment.