From 46ece15e09a55fb3fd0865a91b5b0ef83f21c4b6 Mon Sep 17 00:00:00 2001 From: Konstanty Misiak Date: Mon, 8 Feb 2021 15:14:24 +0100 Subject: [PATCH] Force ocloc cmdline log after fail even if -q option specified Related-To: NEO-4784 Signed-off-by: Konstanty Misiak --- opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp | 3 ++- shared/offline_compiler/source/decoder/helper.h | 2 +- shared/offline_compiler/source/ocloc_api.cpp | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp index e89fe79ae6..d3221b8079 100644 --- a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp @@ -67,6 +67,7 @@ TEST(OclocApiTests, WhenGoodFamilyNameIsProvidedThenSuccessIsReturned) { TEST(OclocApiTests, WhenArgsWithMissingFileAreGivenThenErrorMessageIsProduced) { const char *argv[] = { "ocloc", + "-q", "-file", "test_files/IDoNotExist.cl", "-device", @@ -81,7 +82,7 @@ TEST(OclocApiTests, WhenArgsWithMissingFileAreGivenThenErrorMessageIsProduced) { std::string output = testing::internal::GetCapturedStdout(); EXPECT_EQ(retVal, NEO::OfflineCompiler::ErrorCode::INVALID_FILE); - EXPECT_NE(std::string::npos, output.find("Command was: ocloc -file test_files/IDoNotExist.cl -device "s + argv[4])); + EXPECT_NE(std::string::npos, output.find("Command was: ocloc -q -file test_files/IDoNotExist.cl -device "s + argv[5])); } TEST(OclocApiTests, GivenIncludeHeadersWhenCompilingThenPassesToFclHeadersPackedAsElf) { diff --git a/shared/offline_compiler/source/decoder/helper.h b/shared/offline_compiler/source/decoder/helper.h index 0b64273739..bdad5f2180 100644 --- a/shared/offline_compiler/source/decoder/helper.h +++ b/shared/offline_compiler/source/decoder/helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/shared/offline_compiler/source/ocloc_api.cpp b/shared/offline_compiler/source/ocloc_api.cpp index 96d472fae9..99b758fa3f 100644 --- a/shared/offline_compiler/source/ocloc_api.cpp +++ b/shared/offline_compiler/source/ocloc_api.cpp @@ -59,10 +59,10 @@ Examples: extern "C" { void printOclocCmdLine(unsigned int numArgs, const char *argv[], std::unique_ptr &helper) { - helper->printf("Command was:"); + printf("Command was:"); for (auto i = 0u; i < numArgs; ++i) - helper->printf(" %s", argv[i]); - helper->printf("\n"); + printf(" %s", argv[i]); + printf("\n"); } int oclocInvoke(unsigned int numArgs, const char *argv[],