Skip to content

Disable hipcc optimizations i.e. use -O2 instead of -O3 (work around for gq_ttq crash 806 on AMD GPUs at LUMI) #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valassi merged 14 commits into from
Sep 25, 2024
Merged

Disable hipcc optimizations i.e. use -O2 instead of -O3 (work around for gq_ttq crash 806 on AMD GPUs at LUMI) #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c7b3dc0
[amd] in gq_ttq.mad HiprandRandomNumberKernel.cc, add debug printouts…
valassi Sep 19, 2024
007173a
[amd] in gq_ttq.mad MemoryBuffers.h, temporarely use c++ malloc inste…
valassi Sep 19, 2024
5b8d92f
[amd] in gq_ttq.mad timermap.h, add some debug printouts for the cras…
valassi Sep 19, 2024
5cc62a6
[amd] in gq_ttq.mad cudacpp.mk, enable -ggdb... the issue seems to be…
valassi Sep 19, 2024
29fb00b
[amd] in gq_ttq.mad, revert the last four temporary changes introduce…
valassi Sep 19, 2024
44a6b1d
[amd] in gq_ttq.mad and CODEGEN, work around the memory access crash …
valassi Sep 19, 2024
3c2792a
[amd] in gq_ttq.mad and CODEGEN, work around the memory access crash …
valassi Sep 19, 2024
f91c156
[amd] regenerate all processes, including OPTFLAGS=-O2 for hipcc inst…
valassi Sep 19, 2024
e41c7ff
[amd] rerun 96 tput builds and tests on LUMI worker node (small-g 72h…
valassi Sep 19, 2024
0d7d4cd
[amd] rerun 30 tmad tests on LUMI against AMD GPUs - now gqttq succee…
valassi Sep 20, 2024
b9783a0
[amd] revert to itscrd90 logs for tput/tmad tests
valassi Sep 20, 2024
56814ca
[amd] in gq_ttq.mad and CODEGEN CPPProcess.cc, add HIPCC version to t…
valassi Sep 20, 2024
11b5aa0
[amd] ** COMPLETE AMD ** regenerate all processes (including getCompi…
valassi Sep 20, 2024
0351d1c
[amd] move back to previous upstream/master codegen logs to ease futu…
valassi Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...hX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion ...GIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/process_function_definitions.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -252,7 +264,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -684,7 +696,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/ee_mumu.sa/SubProcesses/P1_Sigma_sm_epem_mupmum/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -682,7 +694,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -699,7 +711,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_tt.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_tt.sa/SubProcesses/P1_Sigma_sm_gg_ttx/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -696,7 +708,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_tt.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_tt01g.mad/SubProcesses/P1_gg_ttx/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -699,7 +711,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_tt01g.mad/SubProcesses/P2_gg_ttxg/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -920,7 +932,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_tt01g.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_ttg.mad/SubProcesses/P1_gg_ttxg/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -920,7 +932,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_ttg.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_ttg.sa/SubProcesses/P1_Sigma_sm_gg_ttxg/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -914,7 +926,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_ttg.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2805,6 +2805,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -2866,7 +2878,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_ttgg.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
14 changes: 13 additions & 1 deletion epochX/cudacpp/gg_ttgg.sa/SubProcesses/P1_Sigma_sm_gg_ttxgg/CPPProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,6 +2862,18 @@ namespace mg5amcCpu
CPPProcess::getCompiler()
{
std::stringstream out;
// HIP version (HIPCC)
// [Use __HIPCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'hipcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
// [Check 'hipcc -dM -E -x hip -I ../../src CPPProcess.cc | grep HIP']
#ifdef __HIPCC__
#if defined HIP_VERSION_MAJOR && defined HIP_VERSION_MINOR && defined HIP_VERSION_PATCH
out << "hipcc " << HIP_VERSION_MAJOR << "." << HIP_VERSION_MINOR << "." << HIP_VERSION_PATCH;
#else
out << "hipcc UNKNOWN";
#endif
out << " (";
#endif
// CUDA version (NVCC)
// [Use __NVCC__ instead of MGONGPUCPP_GPUIMPL here!]
// [This tests if 'nvcc' was used even to build a .cc file, even if not necessarily 'nvcc -x cu' for a .cu file]
Expand Down Expand Up @@ -2923,7 +2935,7 @@ namespace mg5amcCpu
out << "gcc UNKNOWKN";
#endif
#endif
#if defined __NVCC__ or defined __INTEL_LLVM_COMPILER
#if defined __HIPCC__ or defined __NVCC__ or defined __INTEL_LLVM_COMPILER
out << ")";
#endif
return out.str();
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/gg_ttgg.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else ifeq ($(BACKEND),hip)
GPUSUFFIX = hip

# Optimization flags
override OPTFLAGS = -O2 # work around "Memory access fault" in gq_ttq for HIP #806: disable hipcc -O3 optimizations
GPUFLAGS = $(foreach opt, $(OPTFLAGS), $(XCOMPILERFLAG) $(opt))

# DEBUG FLAGS (for #806: see https://hackmd.io/@gmarkoma/lumi_finland)
Expand Down
Loading