This is an archive of the discontinued LLVM Phabricator instance.

Differential D98374

[test-suite] SPEC2017 CPU CAM4 portability updates.
ClosedPublic

Authored by naromero77 on Mar 10 2021, 2:59 PM.

Details

Reviewers
jdoerfert
Meinersbur
fhahn
sameeranjoshi
rovka
homerdin
Commits
rT01f5ea4052f0: [test-suite] SPEC2017 CPU CAM4 portability updates.
Summary

Add -fallow-argument-mismatch only for Fortran and only for compilers that support it.

Diff Detail

Repository
rT test-suite

Event Timeline

naromero77 created this revision.Mar 10 2021, 2:59 PM
Herald added a subscriber: mgorny. · View Herald TranscriptMar 10 2021, 2:59 PM
naromero77 requested review of this revision.Mar 10 2021, 2:59 PM
Harbormaster completed remote builds in B93178: Diff 329789.Mar 10 2021, 2:59 PM
naromero77 added reviewers: jdoerfert, Meinersbur, fhahn, sameeranjoshi, rovka, homerdin.Mar 10 2021, 3:01 PM
naromero77 added subscribers: llvm-commits, naromero77.
Meinersbur added inline comments.Mar 11 2021, 3:22 PM
External/SPEC/CFP2017rate/527.cam4_r/CMakeLists.txt
574

Naming convention for the feature-test variable usually starts with "SUPPORTS_" or "${lang}_SUPPORTS_", e.g. FORTRAN_SUPPORTS_FALLOW_ARGUMENT_MISMATCH.

cmake/modules/Fortran.cmake
30–36

Why add more than CheckFortranCompilerFlag?

naromero77 updated this revision to Diff 330317.Mar 12 2021, 11:28 AM
  • Use standard convention for feature-test variables.
  • Only add CMake Utility Modules that are actually used.
Harbormaster completed remote builds in B93558: Diff 330317.Mar 12 2021, 11:28 AM
naromero77 updated this revision to Diff 330320.Mar 12 2021, 11:30 AM

Trying again to send the patch.

Harbormaster completed remote builds in B93560: Diff 330320.Mar 12 2021, 11:30 AM
Meinersbur accepted this revision.Mar 12 2021, 12:21 PM

LGTM, thnks.

This revision is now accepted and ready to land.Mar 12 2021, 12:21 PM
Closed by commit rT01f5ea4052f0: [test-suite] SPEC2017 CPU CAM4 portability updates. (authored by naromero77). · Explain WhyMar 12 2021, 8:43 PM
This revision was automatically updated to reflect the committed changes.
naromero77 added a commit: rT01f5ea4052f0: [test-suite] SPEC2017 CPU CAM4 portability updates..

Revision Contents

PathSize
External/
SPEC/
CFP2017rate/
527.cam4_r/
8 lines
cmake/
modules/
4 lines

Diff 330419

External/SPEC/CFP2017rate/527.cam4_r/CMakeLists.txt

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Linesadd_definitions(
-D_NETCDF -D_NETCDF
-DNO_R16 -DNO_R16
-DHIDE_MPI -DHIDE_MPI
-D_MPISERIAL -D_MPISERIAL
-DNO_MPI2 -DNO_MPI2
-DSPEC_CASE_FLAG -DSPEC_CASE_FLAG
) )
add_compile_options(-fallow-argument-mismatch)
## test ######################################################################## ## test ########################################################################
speccpu2017_run_test(RUN_TYPE test) speccpu2017_run_test(RUN_TYPE test)
cam4_validator(RUN_TYPE test) cam4_validator(RUN_TYPE test)
## train ####################################################################### ## train #######################################################################
▲ Show 20 Lines • Show All 463 Lines • ▼ Show 20 Linesspeccpu2017_add_executable(
virtem.F90 virtem.F90
vrtmap.F90 vrtmap.F90
wrap_mpi.F90 wrap_mpi.F90
wrf_error_fatal.F90 wrf_error_fatal.F90
wrf_message.F90 wrf_message.F90
zeff.f90 zeff.f90
zenith.F90 zenith.F90
) )
check_fortran_compiler_flag("-fallow-argument-mismatch" SUPPORTS_FALLOW_ARGUMENT_MISMATCH)
MeinersburUnsubmitted
Not Done
ReplyInline Actions

Naming convention for the feature-test variable usually starts with "SUPPORTS_" or "${lang}_SUPPORTS_", e.g. FORTRAN_SUPPORTS_FALLOW_ARGUMENT_MISMATCH.

Meinersbur: Naming convention for the feature-test variable usually starts with "SUPPORTS_" or…
if (SUPPORTS_FALLOW_ARGUMENT_MISMATCH)
target_compile_options(${PROG} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:-fallow-argument-mismatch>)
endif ()
target_link_libraries(${PROG} PRIVATE netcdf) target_link_libraries(${PROG} PRIVATE netcdf)
speccpu2017_prepare_rundir() speccpu2017_prepare_rundir()

cmake/modules/Fortran.cmake

Show All 21 Lines
function(ninja_required) function(ninja_required)
if(NOT CMAKE_GENERATOR STREQUAL "Ninja") if(NOT CMAKE_GENERATOR STREQUAL "Ninja")
message(SEND_ERROR message(SEND_ERROR
"This test is NOT supported by CMAKE_GENERATOR = ${CMAKE_GENERATOR}.\n" "This test is NOT supported by CMAKE_GENERATOR = ${CMAKE_GENERATOR}.\n"
"Please use use Ninja 1.10 or later by adding -G \"Ninja\" to cmake invocation.\n") "Please use use Ninja 1.10 or later by adding -G \"Ninja\" to cmake invocation.\n")
endif() endif()
endfunction() endfunction()
# standard CMake Utility Modules specific to Fortran
# https://cmake.org/cmake/help/latest/manual/cmake-modules.7.html
include(CheckFortranCompilerFlag)