From 66b72cf9b70a459f7330a7b710fedeaa936abc6f Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 21 Sep 2018 14:44:45 -0400 Subject: [PATCH] P4 to Git Change 1609403 by kzhuravl@kzhuravl-fiji-ocllc-2 on 2018/09/21 14:35:36 SWDEV-79445 - clinfo: return EXIT_SUCCESS on success, EXIT_FAILURE on failure. Affected files ... ... //depot/stg/opencl/drivers/opencl/tools/clinfo/clinfo.cpp#6 edit [ROCm/clr commit: d4ffba0544975747e2d7d9e0b70812419858c04e] --- projects/clr/opencl/tools/clinfo/clinfo.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/clr/opencl/tools/clinfo/clinfo.cpp b/projects/clr/opencl/tools/clinfo/clinfo.cpp index 888c1f1187..bcb2482b96 100644 --- a/projects/clr/opencl/tools/clinfo/clinfo.cpp +++ b/projects/clr/opencl/tools/clinfo/clinfo.cpp @@ -120,6 +120,7 @@ jurisdiction and venue of these courts. bool verbose = false; +/// Returns EXIT_SUCCESS on success, EXIT_FAILURE on failure. int main(int argc, char** argv) { @@ -135,7 +136,7 @@ main(int argc, char** argv) } else if ((strcmp(argv[i], "-h") == 0) || (strcmp(argv[i], "--help") == 0)){ std::cout << "Usage is: " << argv[0] << " [-v|--verbose]" << std::endl; - return 0; + return EXIT_FAILURE; } } @@ -673,7 +674,7 @@ main(int argc, char** argv) cl::Context context(device, cps, NULL, NULL, &err); if (err != CL_SUCCESS) { std::cerr << "Context::Context() failed (" << err << ")\n"; - return 1; + return EXIT_FAILURE; } std::string kernelStr("__kernel void hello(){ size_t i = get_global_id(0); size_t j = get_global_id(1);}"); cl::Program::Sources sources(1, std::make_pair(kernelStr.data(), kernelStr.size())); @@ -681,7 +682,7 @@ main(int argc, char** argv) cl::Program program = cl::Program(context, sources, &err); if (err != CL_SUCCESS) { std::cerr << "Program::Program() failed (" << err << ")\n"; - return 1; + return EXIT_FAILURE; } err = program.build(device); @@ -698,13 +699,13 @@ main(int argc, char** argv) } std::cerr << "Program::build() failed (" << err << ")\n"; - return 1; + return EXIT_FAILURE; } cl::Kernel kernel(program, "hello", &err); if (err != CL_SUCCESS) { std::cerr << "Kernel::Kernel() failed (" << err << ")\n"; - return 1; + return EXIT_FAILURE; } std::cout << " Kernel Preferred work group size multiple:\t " @@ -825,6 +826,7 @@ main(int argc, char** argv) << err.err() << ")" << std::endl; + return EXIT_FAILURE; } return status;