[test-suite] r317701 - Revert "[test-suite] Revert rL317483 (HACCKernels Benchmark)"

[Brian Homerding via llvm-commits]

Author: homerdin
Date: Wed Nov  8 09:29:14 2017
New Revision: 317701

URL: http://llvm.org/viewvc/llvm-project?rev=317701&view=rev
Log:
Revert "[test-suite] Revert rL317483 (HACCKernels Benchmark)"

This reverts r317697 with additon of FP_TOLERANCE to account for
use of -ffast-math.

Commit message from r317697:

Test breaks the AVX2 buildbot. Reverting per request.

Differential Revision: https://reviews.llvm.org/D38417

Added:
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/
      - copied from r317483, test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/
Modified:
    test-suite/trunk/LICENSE.TXT
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/Makefile
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/Makefile

Modified: test-suite/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/LICENSE.TXT?rev=317701&r1=317700&r2=317701&view=diff
==============================================================================
--- test-suite/trunk/LICENSE.TXT (original)
+++ test-suite/trunk/LICENSE.TXT Wed Nov  8 09:29:14 2017
@@ -93,6 +93,7 @@ CLAMR:              llvm-test/MultiSourc
 HPCCG:              llvm-test/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG
 PENNANT:            llvm-test/MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT
 miniFE:             llvm-test/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE
+HACCKernels:        llvm-test/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels
 Fhourstones:        llvm-test/MultiSource/Benchmarks/Fhourstones
 Fhourstones-3.1:    llvm-test/MultiSource/Benchmarks/Fhourstones-3.1
 McCat:              llvm-test/MultiSource/Benchmarks/McCat

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/CMakeLists.txt?rev=317701&r1=317700&r2=317701&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt Wed Nov  8 09:29:14 2017
@@ -2,3 +2,4 @@ add_subdirectory(HPCCG)
 add_subdirectory(PENNANT)
 add_subdirectory(miniFE)
 add_subdirectory(CLAMR)
+add_subdirectory(HACCKernels)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/HACCKernels/CMakeLists.txt?rev=317701&r1=317483&r2=317701&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt Wed Nov  8 09:29:14 2017
@@ -1,4 +1,5 @@
 set(PROG HACCKernels)
+set(FP_TOLERANCE 0.00001)
 list(APPEND CPPFLAGS -ffast-math -DVERIFICATION_OUTPUT_ONLY=ON)
 set(RUN_OPTIONS 450)
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/HACCKernels/Makefile?rev=317701&r1=317483&r2=317701&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/Makefile Wed Nov  8 09:29:14 2017
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = HACCKernels
+FP_TOLERANCE = 0.00001
 CXXFLAGS = -ffast-math -DVERIFICATION_OUTPUT_ONLY=ON
 RUN_OPTIONS = 450
 include $(LEVEL)/MultiSource/Makefile.multisrc

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/Makefile?rev=317701&r1=317700&r2=317701&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/Makefile Wed Nov  8 09:29:14 2017
@@ -1,6 +1,6 @@
 # MultiSource/DOE-ProxyApps-C++ Makefile: Build all subdirectories automatically
 
 LEVEL = ../../..
-PARALLEL_DIRS = HPCCG PENNANT miniFE CLAMR
+PARALLEL_DIRS = HPCCG PENNANT miniFE CLAMR HACCKernels
 
 include $(LEVEL)/Makefile.programs