Update ILs with version query

Related-To: NEO-4368

Change-Id: Ic8d51b444dcf1c4bd46b059babbf9e2b7e8a4cec
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2020-06-22 22:29:54 +02:00
committed by sys_ocldev
parent 61cf2b6c33
commit 0992c9342d
3 changed files with 5 additions and 4 deletions

View File

@ -26,6 +26,7 @@ extern const char *familyName[];
static std::string vendor = "Intel(R) Corporation";
static std::string profile = "FULL_PROFILE";
static std::string spirVersions = "1.2 ";
static std::string spirvName = "SPIR-V";
#define QTR(a) #a
#define TOSTR(b) QTR(b)
static std::string driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
@ -133,7 +134,7 @@ void ClDevice::initializeCaps() {
deviceExtensions += "cl_khr_il_program ";
deviceInfo.ilsWithVersion[0].version = CL_MAKE_VERSION(1, 2, 0);
strcpy_s(deviceInfo.ilsWithVersion[0].name, CL_NAME_VERSION_MAX_NAME_SIZE, sharedDeviceInfo.ilVersion);
strcpy_s(deviceInfo.ilsWithVersion[0].name, CL_NAME_VERSION_MAX_NAME_SIZE, spirvName.c_str());
if (supportsVme) {
deviceExtensions += "cl_intel_spirv_device_side_avc_motion_estimation ";

View File

@ -549,7 +549,7 @@ TEST(GetDeviceInfo, WhenQueryingIlsWithVersionThenProperValueIsReturned) {
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(sizeof(cl_name_version), paramRetSize);
EXPECT_EQ(CL_MAKE_VERSION(1u, 2u, 0u), ilsWithVersion->version);
EXPECT_STREQ("SPIR-V_1.2 ", ilsWithVersion->name);
EXPECT_STREQ("SPIR-V", ilsWithVersion->name);
} else {
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(0u, paramRetSize);

View File

@ -14,7 +14,7 @@
namespace NEO {
static const char *spirvVersion = "SPIR-V_1.2 ";
static const char *spirvWithVersion = "SPIR-V_1.2 ";
void Device::initializeCaps() {
auto &hwInfo = getHardwareInfo();
@ -32,7 +32,7 @@ void Device::initializeCaps() {
ocl21FeaturesEnabled = DebugManager.flags.ForceOCL21FeaturesSupport.get();
}
if (ocl21FeaturesEnabled) {
deviceInfo.ilVersion = spirvVersion;
deviceInfo.ilVersion = spirvWithVersion;
addressing32bitAllowed = false;
}