From 8fb3be8f4d091e44c510570547e4b06543d2cf88 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 6 Sep 2022 11:40:52 +0200 Subject: [PATCH 1/3] Report exit code when compiler invocation fails --- src/occa/internal/modes/cuda/device.cpp | 2 +- src/occa/internal/modes/dpcpp/device.cpp | 2 +- src/occa/internal/modes/hip/device.cpp | 2 +- src/occa/internal/modes/metal/device.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/occa/internal/modes/cuda/device.cpp b/src/occa/internal/modes/cuda/device.cpp index 85471ec1a..ce7e2fc21 100644 --- a/src/occa/internal/modes/cuda/device.cpp +++ b/src/occa/internal/modes/cuda/device.cpp @@ -315,7 +315,7 @@ namespace occa { if (commandExitCode) { OCCA_FORCE_ERROR( "Error compiling [" << kernelName << "]," - " Command: [" << sCommand << ']' + " Command: [" << sCommand << "] exited with code " << commandExitCode << "\n" << "Output:\n\n" << commandOutput << "\n" ); diff --git a/src/occa/internal/modes/dpcpp/device.cpp b/src/occa/internal/modes/dpcpp/device.cpp index 45d2e99ec..e2c8987d8 100644 --- a/src/occa/internal/modes/dpcpp/device.cpp +++ b/src/occa/internal/modes/dpcpp/device.cpp @@ -225,7 +225,7 @@ namespace occa if (compileError) { OCCA_FORCE_ERROR("Error compiling [" << kernelName << "]," - << " Command: ["<< sCommand << ']'); + << " Command: ["<< sCommand << "] exited with code " << compileError << "\n"); } } diff --git a/src/occa/internal/modes/hip/device.cpp b/src/occa/internal/modes/hip/device.cpp index 5fd9a72d7..e2befe66f 100644 --- a/src/occa/internal/modes/hip/device.cpp +++ b/src/occa/internal/modes/hip/device.cpp @@ -306,7 +306,7 @@ namespace occa { if (commandExitCode) { OCCA_FORCE_ERROR( "Error compiling [" << kernelName << "]," - " Command: [" << sCommand << "]\n" + " Command: [" << sCommand << "] exited with code " << commandExitCode << "\n\n" << "Output:\n\n" << commandOutput << "\n" ); diff --git a/src/occa/internal/modes/metal/device.cpp b/src/occa/internal/modes/metal/device.cpp index bd31e5c7a..227af713d 100644 --- a/src/occa/internal/modes/metal/device.cpp +++ b/src/occa/internal/modes/metal/device.cpp @@ -172,7 +172,7 @@ namespace occa { if (commandExitCode) { OCCA_FORCE_ERROR( "Error compiling [" << kernelName << "]," - " Command: [" << airCommand << ']' + " Command: [" << airCommand << "] exited with code " << commandExitCode << "\n\n" << "Output:\n\n" << commandOutput << "\n" ); @@ -210,7 +210,7 @@ namespace occa { if (commandExitCode) { OCCA_FORCE_ERROR( "Error compiling [" << kernelName << "]," - " Command: [" << metallibCommand << ']' + " Command: [" << metallibCommand << "] exited with code " << commandExitCode << "\n\n" << "Output:\n\n" << commandOutput << "\n" ); From c58f9d689695e35929990d22c98a1718a7fea966 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 6 Sep 2022 11:43:21 +0200 Subject: [PATCH 2/3] Make DPCPP and Metal compileKernel output more consistent with other modes --- src/occa/internal/modes/dpcpp/device.cpp | 26 ++++++++++++++++-------- src/occa/internal/modes/metal/device.cpp | 4 ++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/occa/internal/modes/dpcpp/device.cpp b/src/occa/internal/modes/dpcpp/device.cpp index e2c8987d8..de3b00bfb 100644 --- a/src/occa/internal/modes/dpcpp/device.cpp +++ b/src/occa/internal/modes/dpcpp/device.cpp @@ -215,17 +215,25 @@ namespace occa } const std::string &sCommand = command.str(); - if (verbose) - { - io::stdout << sCommand << '\n'; + if (verbose) { + io::stdout << "Compiling [" << kernelName << "]\n" << sCommand << "\n"; } - const int compileError = system(sCommand.c_str()); - - if (compileError) - { - OCCA_FORCE_ERROR("Error compiling [" << kernelName << "]," - << " Command: ["<< sCommand << "] exited with code " << compileError << "\n"); + std::string commandOutput; + const int commandExitCode = sys::call( + sCommand.c_str(), + commandOutput + ); + + if (commandExitCode) { + OCCA_FORCE_ERROR( + "Error compiling [" << kernelName << "]," + " Command: [" << sCommand << "] exited with code " << commandExitCode << "\n\n" + << "Output:\n\n" + << commandOutput << "\n" + ); + } else if (verbose) { + io::stdout << "Output:\n\n" << commandOutput << "\n"; } } diff --git a/src/occa/internal/modes/metal/device.cpp b/src/occa/internal/modes/metal/device.cpp index 227af713d..4f311587a 100644 --- a/src/occa/internal/modes/metal/device.cpp +++ b/src/occa/internal/modes/metal/device.cpp @@ -160,7 +160,7 @@ namespace occa { const std::string airCommand = command.str(); if (verbose) { - io::stdout << "Compiling [" << kernelName << "]\n" << airCommand << "\n"; + io::stdout << "Compiling Air Binary [" << kernelName << "]\n" << airCommand << "\n"; } std::string commandOutput; @@ -198,7 +198,7 @@ namespace occa { const std::string metallibCommand = command.str(); if (verbose) { - io::stdout << metallibCommand << '\n'; + io::stdout << "Compiling Metallib [" << kernelName << "]\n" << metallibCommand << "\n"; } std::string commandOutput; From e453059094b9cc8d39b84c8d08166d910c140d2a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 6 Sep 2022 13:22:31 +0200 Subject: [PATCH 3/3] Check whether popen actually returns a stream --- src/occa/internal/utils/sys.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/occa/internal/utils/sys.cpp b/src/occa/internal/utils/sys.cpp index 7147ded9c..ea8442cfe 100644 --- a/src/occa/internal/utils/sys.cpp +++ b/src/occa/internal/utils/sys.cpp @@ -179,9 +179,11 @@ namespace occa { int call(const std::string &cmdline) { #if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS)) FILE *fp = popen(cmdline.c_str(), "r"); + if (!fp) return errno; return pclose(fp); #else FILE *fp = _popen(cmdline.c_str(), "r"); + if (!fp) return errno; return _pclose(fp); #endif } @@ -193,8 +195,13 @@ namespace occa { FILE *fp = _popen(cmdline.c_str(), "r"); #endif - size_t lineBytes = 512; - char lineBuffer[512]; + if (!fp) { + output = "Failed to launch process"; + return errno; + } + + const size_t lineBytes = 512; + char lineBuffer[lineBytes]; output = ""; while (fgets(lineBuffer, lineBytes, fp)) {