From 5945aab1f6c3d12f15341cfca32f847f46cb86d5 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Wed, 22 Jul 2015 22:59:20 +0000 Subject: [PATCH] Leave out the SingleSource/UnitTests directory in benchmarking only mode 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 --- MultiSource/Makefile | 2 + MultiSource/UnitTests/C++11/Makefile | 4 - SingleSource/Makefile | 5 +- SingleSource/UnitTests/Makefile | 91 ------------------- .../UnitTests/SignlessTypes/Large/Makefile | 4 - SingleSource/UnitTests/SignlessTypes/Makefile | 4 - SingleSource/UnitTests/Threads/Makefile | 4 - .../UnitTests/Vector/Altivec/Makefile | 8 -- SingleSource/UnitTests/Vector/Makefile | 4 - 9 files changed, 6 insertions(+), 120 deletions(-) diff --git a/MultiSource/Makefile b/MultiSource/Makefile index fd7d13d82e..4c6117e39d 100644 --- a/MultiSource/Makefile +++ b/MultiSource/Makefile @@ -2,7 +2,9 @@ LEVEL = .. PARALLEL_DIRS := Applications Benchmarks +ifndef BENCHMARKING_ONLY PARALLEL_DIRS += UnitTests +endif include $(LEVEL)/Makefile.programs diff --git a/MultiSource/UnitTests/C++11/Makefile b/MultiSource/UnitTests/C++11/Makefile index 492196aeb5..06b1a8f637 100644 --- a/MultiSource/UnitTests/C++11/Makefile +++ b/MultiSource/UnitTests/C++11/Makefile @@ -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 diff --git a/SingleSource/Makefile b/SingleSource/Makefile index 1b889aaaa4..7e3a2c11e5 100644 --- a/SingleSource/Makefile +++ b/SingleSource/Makefile @@ -1,6 +1,9 @@ LEVEL = .. -PARALLEL_DIRS := UnitTests Regression Benchmarks +PARALLEL_DIRS := Regression Benchmarks +ifndef BENCHMARKING_ONLY +PARALLEL_DIRS += UnitTests +endif LDFLAGS += -lm diff --git a/SingleSource/UnitTests/Makefile b/SingleSource/UnitTests/Makefile index 2a5899726b..636f37bf94 100644 --- a/SingleSource/UnitTests/Makefile +++ b/SingleSource/UnitTests/Makefile @@ -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 diff --git a/SingleSource/UnitTests/SignlessTypes/Large/Makefile b/SingleSource/UnitTests/SignlessTypes/Large/Makefile index 6636e811f7..b86c20959b 100644 --- a/SingleSource/UnitTests/SignlessTypes/Large/Makefile +++ b/SingleSource/UnitTests/SignlessTypes/Large/Makefile @@ -9,8 +9,4 @@ EXEC_XFAILS = cast endif endif -ifdef BENCHMARKING_ONLY -PROGRAMS_TO_SKIP += cast -endif - include $(LEVEL)/SingleSource/Makefile.singlesrc diff --git a/SingleSource/UnitTests/SignlessTypes/Makefile b/SingleSource/UnitTests/SignlessTypes/Makefile index bd5b078abf..74a6842b7d 100644 --- a/SingleSource/UnitTests/SignlessTypes/Makefile +++ b/SingleSource/UnitTests/SignlessTypes/Makefile @@ -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 diff --git a/SingleSource/UnitTests/Threads/Makefile b/SingleSource/UnitTests/Threads/Makefile index 30fc2fa4cc..ec4b7c775f 100644 --- a/SingleSource/UnitTests/Threads/Makefile +++ b/SingleSource/UnitTests/Threads/Makefile @@ -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 diff --git a/SingleSource/UnitTests/Vector/Altivec/Makefile b/SingleSource/UnitTests/Vector/Altivec/Makefile index b1c35b1f3b..4f8f2cd9f5 100644 --- a/SingleSource/UnitTests/Vector/Altivec/Makefile +++ b/SingleSource/UnitTests/Vector/Altivec/Makefile @@ -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 diff --git a/SingleSource/UnitTests/Vector/Makefile b/SingleSource/UnitTests/Vector/Makefile index c0088535ab..3913cf1974 100644 --- a/SingleSource/UnitTests/Vector/Makefile +++ b/SingleSource/UnitTests/Vector/Makefile @@ -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