intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 00:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not pass msaa sharing to compile for CL in version below 1.2

Browse Source 
Related-To: NEO-15673
Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>
This commit is contained in:
Maciej Plewka
2025-11-25 07:55:55 +00:00
committed by Compute-Runtime-Automation
parent 861ea7200d
commit c3912acaca
5 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/source/program/build.cpp
View File

@@ -86,6 +86,7 @@ cl_int Program::build(
: defaultClDevice->peekCompilerExtensions();
appendAdditionalExtensions(extensions, options, internalOptions);
removeNotSupportedExtensions(extensions, options, internalOptions);
CompilerOptions::concatenateAppend(internalOptions, extensions);
auto ailHelper = defaultDevice.getRootDeviceEnvironment().getAILConfigurationHelper();

35
shared/source/helpers/compiler_options_parser.cpp
View File

@@ -20,23 +20,30 @@ namespace NEO {
const std::string clStdOptionName = "-cl-std=CL";
uint32_t getMajorVersion(const std::string &compileOptions) {
std::pair<uint32_t, uint32_t> getMajorMinorVersion(const std::string &compileOptions) {
const std::string clStdOptionName = "-cl-std=CL";
auto clStdValuePosition = compileOptions.find(clStdOptionName);
if (clStdValuePosition == std::string::npos) {
return 0;
return {0, 0};
}
std::stringstream ss{compileOptions.c_str() + clStdValuePosition + clStdOptionName.size()};
uint32_t majorVersion;
ss >> majorVersion;
return majorVersion;
uint32_t majorVersion = 0, minorVersion = 0;
char dot = 0;
ss >> majorVersion >> dot >> minorVersion;
return {majorVersion, minorVersion};
}
bool requiresOpenClCFeatures(const std::string &compileOptions) {
return (getMajorVersion(compileOptions) >= 3);
return (getMajorMinorVersion(compileOptions).first >= 3);
}
bool requiresAdditionalExtensions(const std::string &compileOptions) {
return (getMajorVersion(compileOptions) == 2);
return (getMajorMinorVersion(compileOptions).first == 2);
}
bool isOclVersionBelow12(const std::string &compileOptions) {
auto [majorVersion, minorVersion] = getMajorMinorVersion(compileOptions);
return majorVersion == 1 && minorVersion < 2;
}
void appendAdditionalExtensions(std::string &extensions, const std::string &compileOptions, const std::string &internalOptions) {
@@ -50,6 +57,20 @@ void appendAdditionalExtensions(std::string &extensions, const std::string &comp
}
}
void removeMsaaSharingExtension(std::string &extensions) {
const std::string toRemove = "+cl_khr_gl_msaa_sharing";
size_t pos = extensions.find(toRemove);
if (pos != std::string::npos) {
extensions.erase(pos, toRemove.length());
}
}
void removeNotSupportedExtensions(std::string &extensions, const std::string &compileOptions, const std::string &internalOptions) {
if (isOclVersionBelow12(compileOptions)) {
removeMsaaSharingExtension(extensions);
}
}
void appendExtensionsToInternalOptions(const HardwareInfo &hwInfo, const std::string &options, std::string &internalOptions) {
auto compilerProductHelper = CompilerProductHelper::create(hwInfo.platform.eProductFamily);
UNRECOVERABLE_IF(!compilerProductHelper);

3
shared/source/helpers/compiler_options_parser.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2023 Intel Corporation
* Copyright (C) 2020-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -19,5 +19,6 @@ bool requiresAdditionalExtensions(const std::string &compileOptions);
void appendAdditionalExtensions(std::string &extensions, const std::string &compileOptions, const std::string &internalOptions);
void appendExtensionsToInternalOptions(const HardwareInfo &hwInfo, const std::string &options, std::string &internalOptions);
void removeNotSupportedExtensions(std::string &extensions, const std::string &compileOptions, const std::string &internalOptions);
} // namespace NEO

1
shared/test/unit_test/helpers/CMakeLists.txt
View File

@@ -17,6 +17,7 @@ target_sources(neo_shared_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_tests_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cache_policy_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helpers_tests.cpp

74
shared/test/unit_test/helpers/compiler_options_parser_tests.cpp Normal file
View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/helpers/compiler_options_parser.h"
#include "shared/test/common/test_macros/test.h"
using namespace NEO;
TEST(CompilerOptionsParser, GivenClStdOptionWithVariousVersionsWhenRequiresOpenClCFeaturesThenCorrectResult) {
EXPECT_FALSE(requiresOpenClCFeatures("-cl-std=CL1.2"));
EXPECT_FALSE(requiresOpenClCFeatures("-cl-std=CL2.0"));
EXPECT_TRUE(requiresOpenClCFeatures("-cl-std=CL3.0"));
EXPECT_TRUE(requiresOpenClCFeatures("-cl-std=CL4.0"));
}
TEST(CompilerOptionsParser, GivenClStdOptionWithVariousVersionsWhenRequiresAdditionalExtensionsThenCorrectResult) {
EXPECT_FALSE(requiresAdditionalExtensions("-cl-std=CL1.2"));
EXPECT_TRUE(requiresAdditionalExtensions("-cl-std=CL2.0"));
EXPECT_FALSE(requiresAdditionalExtensions("-cl-std=CL3.0"));
}
TEST(CompilerOptionsParser, GivenExtensionsAndCompileOptionsWhenAppendAdditionalExtensionsThenCorrectlyAppends) {
std::string extensions = "ext1 ";
std::string compileOptions = "-cl-std=CL2.0";
std::string internalOptions = "";
appendAdditionalExtensions(extensions, compileOptions, internalOptions);
EXPECT_NE(extensions.find("cl_khr_3d_image_writes"), std::string::npos);
// Test with fp64-gen-emu
extensions = "ext1 ";
internalOptions = "-cl-fp64-gen-emu";
appendAdditionalExtensions(extensions, compileOptions, internalOptions);
EXPECT_NE(extensions.find("cl_khr_fp64"), std::string::npos);
EXPECT_NE(extensions.find("__opencl_c_fp64"), std::string::npos);
}
TEST(CompilerOptionsParser, GivenExtensionsWithMsaaSharingWhenRemoveNotSupportedExtensionsThenMsaaSharingIsRemovedForOclVersionBelow12) {
std::string extensions = "ext1 +cl_khr_gl_msaa_sharing ext2";
std::string compileOptions = "-cl-std=CL1.1";
std::string internalOptions = "";
removeNotSupportedExtensions(extensions, compileOptions, internalOptions);
EXPECT_EQ(extensions.find("+cl_khr_gl_msaa_sharing"), std::string::npos);
// Should not remove for 1.2
extensions = "ext1 +cl_khr_gl_msaa_sharing ext2";
compileOptions = "-cl-std=CL1.2";
removeNotSupportedExtensions(extensions, compileOptions, internalOptions);
EXPECT_NE(extensions.find("+cl_khr_gl_msaa_sharing"), std::string::npos);
}
TEST(CompilerOptionsParser, GivenNoClStdOptionWhenRequiresOpenClCFeaturesAndRequiresAdditionalExtensionsThenFalse) {
std::string options = "-other-option";
EXPECT_FALSE(requiresOpenClCFeatures(options));
EXPECT_FALSE(requiresAdditionalExtensions(options));
}
TEST(CompilerOptionsParser, GivenExtensionsWithoutMsaaSharingWhenRemoveNotSupportedExtensionsThenNoChange) {
std::string extensions = "ext1 ext2";
std::string compileOptions = "-cl-std=CL1.1";
std::string internalOptions = "";
removeNotSupportedExtensions(extensions, compileOptions, internalOptions);
EXPECT_EQ(extensions, "ext1 ext2");
}
TEST(CompilerOptionsParser, GivenAppendAdditionalExtensionsWithNoMatchThenNoChange) {
std::string extensions = "ext1 ";
std::string compileOptions = "-cl-std=CL1.2";
std::string internalOptions = "";
appendAdditionalExtensions(extensions, compileOptions, internalOptions);
EXPECT_EQ(extensions, "ext1 ");
}