aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Atanasyan <simon@atanasyan.com>2019-03-24 18:27:59 +0000
committerSimon Atanasyan <simon@atanasyan.com>2019-03-24 18:27:59 +0000
commitc05215a3bfe4de412b216d44da23ad653eb94809 (patch)
treeb79fbdc57bb80041cbb947f9cdca5243604bd233
parent73d6ab60ab916da75b7999802dfa8d3c850f4a6e (diff)
[test-suite][mips] Fix compile options for tramp3d-v4 test
The -mxgot flag was negatively effecting certain micromips builds. This patch narrows its use to to only mips64 targets. Patch by Miloš Stojanović. Differential Revision: http://reviews.llvm.org/D59612 git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@356863 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt2
-rw-r--r--MultiSource/Benchmarks/tramp3d-v4/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt b/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
index cb03eb7c..aa9016d9 100644
--- a/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
+++ b/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
@@ -5,7 +5,7 @@ if(SMALL_PROBLEM_SIZE)
else()
set(RUN_OPTIONS --cartvis 1.0 0.0 --rhomin 1e-8 -n 10 --domain 32 32 32)
endif()
-if("${ARCH}" STREQUAL "Mips")
+if(MIPS_IS_MIPS64_ENABLED)
list(APPEND CXXFLAGS -mxgot)
endif()
set(FP_ABSTOLERANCE 0.0000001)
diff --git a/MultiSource/Benchmarks/tramp3d-v4/Makefile b/MultiSource/Benchmarks/tramp3d-v4/Makefile
index 9f62d22a..76ef6863 100644
--- a/MultiSource/Benchmarks/tramp3d-v4/Makefile
+++ b/MultiSource/Benchmarks/tramp3d-v4/Makefile
@@ -10,7 +10,7 @@ RUN_OPTIONS = --cartvis 1.0 0.0 --rhomin 1e-8 -n 10 --domain 32 32 32
endif
FP_ABSTOLERANCE := 0.0000001
-ifeq ($(ARCH),Mips)
+ifeq (-mabi=n64, $(findstring -mabi=n64, $(TARGET_FLAGS)))
# Mips needs a bit more compilation time when Mips64r6 and MSA are used
# together.
RUNTIMELIMIT := 700