This is an archive of the discontinued LLVM Phabricator instance.

Differential D107863

Remove TEST_SUITE_CXX_ABI option
ClosedPublic

Authored by MatzeB on Aug 10 2021, 12:51 PM.

Details

Reviewers
phosek
Commits
rTe148d26e7303: Remove unnecessary TEST_SUITE_CXX_ABI
Summary

TEST_SUITE_CXX_ABI allows to set the library name of the C++ ABI library. However the only benchmark using it (obsequi) only consists of .c files we can just stop linking against the C++ abi and no longer need the TEST_SUITE_CXX_ABI option.

Diff Detail

Repository
rT test-suite

Event Timeline

MatzeB created this revision.Aug 10 2021, 12:51 PM
Herald added subscribers: wenlei, mgorny, mcrosier. · View Herald TranscriptAug 10 2021, 12:51 PM
MatzeB requested review of this revision.Aug 10 2021, 12:51 PM
MatzeB edited the summary of this revision. (Show Details)
phosek accepted this revision.Aug 10 2021, 6:43 PM

LGTM

This revision is now accepted and ready to land.Aug 10 2021, 6:43 PM
Closed by commit rTe148d26e7303: Remove unnecessary TEST_SUITE_CXX_ABI (authored by MatzeB). · Explain WhyAug 12 2021, 4:23 PM
This revision was automatically updated to reflect the committed changes.
MatzeB added a commit: rTe148d26e7303: Remove unnecessary TEST_SUITE_CXX_ABI.

Revision Contents

PathSize
15 lines
MultiSource/
Applications/
obsequi/
3 lines
5 lines

Diff 366145

CMakeLists.txt

Show First 20 Lines • Show All 218 Lines • ▼ Show 20 Linesif(CMAKE_SYSTEM_NAME STREQUAL "AIX")
if(DEFINED ENV{OBJECT_MODE}) if(DEFINED ENV{OBJECT_MODE})
# Specify maximum data heap size on AIX for 32-bit programs. # Specify maximum data heap size on AIX for 32-bit programs.
if($ENV{OBJECT_MODE} STREQUAL "32") if($ENV{OBJECT_MODE} STREQUAL "32")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-bmaxdata:0x80000000") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-bmaxdata:0x80000000")
endif() endif()
endif() endif()
endif() endif()
# This is either directly the C++ ABI library or the full C++ library
# which pulls in the ABI transitively.
set(TEST_SUITE_CXX_ABI "default" CACHE STRING "Specify C++ ABI library to use.")
set(CXXABIS "none default libstdc++ libsupc++ libc++ libc++abi")
set_property(CACHE TEST_SUITE_CXX_ABI PROPERTY STRINGS "${CXXABIS}")
if (TEST_SUITE_CXX_ABI STREQUAL "default")
if (APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|Fuchsia")
set(TEST_SUITE_CXX_ABI_LIBNAME "c++abi")
else()
set(TEST_SUITE_CXX_ABI_LIBNAME "supc++")
endif()
else()
STRING(REGEX REPLACE "^lib" "" TEST_SUITE_CXX_ABI_LIBNAME ${TEST_SUITE_CXX_ABI})
endif()
include(TestSuite) include(TestSuite)
include(SingleMultiSource) include(SingleMultiSource)
# Needs by External/sollve_vv. # Needs by External/sollve_vv.
find_package(OpenMP) find_package(OpenMP)
# Fortran Helper Modules # Fortran Helper Modules
if(TEST_SUITE_FORTRAN) if(TEST_SUITE_FORTRAN)
include(Fortran) include(Fortran)
endif() endif()
▲ Show 20 Lines • Show All 159 Lines • Show Last 20 Lines

MultiSource/Applications/obsequi/CMakeLists.txt

list(APPEND CPPFLAGS -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE) list(APPEND CPPFLAGS -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE)
list(APPEND CPPFLAGS -DTWO_STAGE_GENERATION) list(APPEND CPPFLAGS -DTWO_STAGE_GENERATION)
if(SMALL_PROBLEM_SIZE) if(SMALL_PROBLEM_SIZE)
list(APPEND CPPFLAGS -DHASHCODEBITS=15) list(APPEND CPPFLAGS -DHASHCODEBITS=15)
else() else()
list(APPEND CPPFLAGS -DHASHCODEBITS=23) list(APPEND CPPFLAGS -DHASHCODEBITS=23)
endif() endif()
if(NOT "${ARCH}" STREQUAL "PowerPC")
list(APPEND LDFLAGS -l${TEST_SUITE_CXX_ABI_LIBNAME})
endif()
set(RUN_OPTIONS < input) set(RUN_OPTIONS < input)
llvm_multisource(Obsequi) llvm_multisource(Obsequi)
llvm_test_data(Obsequi input) llvm_test_data(Obsequi input)

MultiSource/Applications/obsequi/Makefile

LEVEL = ../../.. LEVEL = ../../..
PROG = Obsequi PROG = Obsequi
CPPFLAGS += -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE CPPFLAGS += -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE
CPPFLAGS += -DTWO_STAGE_GENERATION CPPFLAGS += -DTWO_STAGE_GENERATION
ifdef SMALL_PROBLEM_SIZE ifdef SMALL_PROBLEM_SIZE
CPPFLAGS += -DHASHCODEBITS=15 CPPFLAGS += -DHASHCODEBITS=15
else else
CPPFLAGS += -DHASHCODEBITS=23 CPPFLAGS += -DHASHCODEBITS=23
endif endif
ifeq (,$(filter $(ARCH),PowerPC Mips))
LDFLAGS = -lsupc++
LIBS += -lsupc++
endif
STDIN_FILENAME=$(PROJ_SRC_DIR)/input STDIN_FILENAME=$(PROJ_SRC_DIR)/input
include ../../Makefile.multisrc include ../../Makefile.multisrc