Enable All warnings and warnings as errors to cleanup code

-Related-To: VLCLJ-1951 Signed-off-by: Neil R Spruit <neil.r.spruit@intel.com>
oneapi-src · Aug 30, 2023 · cfc05b0 · cfc05b0
1 parent 0c0f636
commit cfc05b0
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 65 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,6 +96,7 @@ if(NOT MSVC)
  else()
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
  endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wnon-virtual-dtor")
 endif()
 
 #MSVC compile flags

diff --git a/scripts/templates/ldrddi.cpp.mako b/scripts/templates/ldrddi.cpp.mako
@@ -268,7 +268,9 @@ ${tbl['export']['name']}(
 
  ${x}_result_t result = ${X}_RESULT_SUCCESS;
 
+ %if tbl['experimental'] is False: #//Experimental Tables may not be implemented in driver
  bool atLeastOneDriverValid = false;
+ %endif
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -286,12 +288,14 @@ ${tbl['export']['name']}(
  %else:
  continue; 
  %endif
+ %if tbl['experimental'] is False: #//Experimental Tables may not be implemented in driver
  auto getTableResult = getTable( version, &drv.dditable.${n}.${tbl['name']});
  if(getTableResult == ZE_RESULT_SUCCESS) 
  atLeastOneDriverValid = true;
- %if tbl['experimental'] is False:
  else
  drv.initStatus = getTableResult;
+ %else:
+ result = getTable( version, &drv.dditable.${n}.${tbl['name']});
  %endif
  }
 

diff --git a/scripts/templates/validation/entry_points.h.mako b/scripts/templates/validation/entry_points.h.mako
@@ -33,5 +33,6 @@ ${line} \
 %endfor
 ) {return ZE_RESULT_SUCCESS;}
  %endfor
+ virtual ~${N}ValidationEntryPoints() {}
 };
 }
diff --git a/source/inc/ze_util.h b/source/inc/ze_util.h
@@ -16,14 +16,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 #if defined(_WIN32)
 # include <Windows.h>
-static void getLastErrorString(std::string &errorValue) {
+inline void getLastErrorString(std::string &errorValue) {
  DWORD errorID = GetLastError();
  if (errorID) {
 
  LPSTR tempErrorMessage = nullptr;
 
- auto size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-  NULL, errorID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&tempErrorMessage, 0, NULL);
+ FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, errorID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&tempErrorMessage, 0, NULL);
 
  errorValue.assign(tempErrorMessage);
 

diff --git a/source/layers/validation/common/ze_entry_points.h b/source/layers/validation/common/ze_entry_points.h
@@ -181,5 +181,6 @@ class ZEValidationEntryPoints {
  virtual ze_result_t zeRTASParallelOperationGetPropertiesExp( ze_rtas_parallel_operation_exp_handle_t hParallelOperation, ze_rtas_parallel_operation_exp_properties_t* pProperties ) {return ZE_RESULT_SUCCESS;}
  virtual ze_result_t zeRTASParallelOperationJoinExp( ze_rtas_parallel_operation_exp_handle_t hParallelOperation ) {return ZE_RESULT_SUCCESS;}
  virtual ze_result_t zeRTASParallelOperationDestroyExp( ze_rtas_parallel_operation_exp_handle_t hParallelOperation ) {return ZE_RESULT_SUCCESS;}
+ virtual ~ZEValidationEntryPoints() {}
 };
 }
diff --git a/source/layers/validation/common/zes_entry_points.h b/source/layers/validation/common/zes_entry_points.h
@@ -145,5 +145,6 @@ class ZESValidationEntryPoints {
  virtual ze_result_t zesTemperatureGetState( zes_temp_handle_t hTemperature, double* pTemperature ) {return ZE_RESULT_SUCCESS;}
  virtual ze_result_t zesPowerGetLimitsExt( zes_pwr_handle_t hPower, uint32_t* pCount, zes_power_limit_ext_desc_t* pSustained ) {return ZE_RESULT_SUCCESS;}
  virtual ze_result_t zesPowerSetLimitsExt( zes_pwr_handle_t hPower, uint32_t* pCount, zes_power_limit_ext_desc_t* pSustained ) {return ZE_RESULT_SUCCESS;}
+ virtual ~ZESValidationEntryPoints() {}
 };
 }
diff --git a/source/layers/validation/common/zet_entry_points.h b/source/layers/validation/common/zet_entry_points.h
@@ -60,5 +60,6 @@ class ZETValidationEntryPoints {
  virtual ze_result_t zetMetricGroupGetGlobalTimestampsExp( zet_metric_group_handle_t hMetricGroup, ze_bool_t synchronizedWithHost, uint64_t* globalTimestamp, uint64_t* metricTimestamp ) {return ZE_RESULT_SUCCESS;}
  virtual ze_result_t zetMetricGroupGetExportDataExp( zet_metric_group_handle_t hMetricGroup, const uint8_t* pRawData, size_t rawDataSize, size_t* pExportDataSize, uint8_t * pExportData ) {return ZE_RESULT_SUCCESS;}
  virtual ze_result_t zetMetricGroupCalculateMetricExportDataExp( ze_driver_handle_t hDriver, zet_metric_group_calculation_type_t type, size_t exportDataSize, const uint8_t* pExportData, zet_metric_calculate_exp_desc_t* pCalculateDescriptor, uint32_t* pSetCount, uint32_t* pTotalMetricValueCount, uint32_t* pMetricCounts, zet_typed_value_t* pMetricValues ) {return ZE_RESULT_SUCCESS;}
+ virtual ~ZETValidationEntryPoints() {}
 };
 }
diff --git a/source/loader/ze_ldrddi.cpp b/source/loader/ze_ldrddi.cpp
@@ -5640,7 +5640,6 @@ zeGetRTASBuilderExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -5650,9 +5649,7 @@ zeGetRTASBuilderExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetRTASBuilderExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.RTASBuilderExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.RTASBuilderExp);
  }
 
 
@@ -5722,7 +5719,6 @@ zeGetRTASParallelOperationExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -5732,9 +5728,7 @@ zeGetRTASParallelOperationExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetRTASParallelOperationExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.RTASParallelOperationExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.RTASParallelOperationExp);
  }
 
 
@@ -5895,7 +5889,6 @@ zeGetDriverExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -5905,9 +5898,7 @@ zeGetDriverExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetDriverExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.DriverExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.DriverExp);
  }
 
 
@@ -6077,7 +6068,6 @@ zeGetDeviceExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -6087,9 +6077,7 @@ zeGetDeviceExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetDeviceExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.DeviceExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.DeviceExp);
  }
 
 
@@ -6542,7 +6530,6 @@ zeGetEventExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -6552,9 +6539,7 @@ zeGetEventExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetEventExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.EventExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.EventExp);
  }
 
 
@@ -6889,7 +6874,6 @@ zeGetImageExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -6899,9 +6883,7 @@ zeGetImageExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetImageExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.ImageExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.ImageExp);
  }
 
 
@@ -7065,7 +7047,6 @@ zeGetKernelExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -7075,9 +7056,7 @@ zeGetKernelExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetKernelExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.KernelExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.KernelExp);
  }
 
 
@@ -7240,7 +7219,6 @@ zeGetMemExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -7250,9 +7228,7 @@ zeGetMemExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetMemExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.MemExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.MemExp);
  }
 
 
@@ -7764,7 +7740,6 @@ zeGetFabricEdgeExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -7774,9 +7749,7 @@ zeGetFabricEdgeExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetFabricEdgeExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.FabricEdgeExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.FabricEdgeExp);
  }
 
 
@@ -7845,7 +7818,6 @@ zeGetFabricVertexExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -7855,9 +7827,7 @@ zeGetFabricVertexExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zeGetFabricVertexExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.ze.FabricVertexExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.ze.FabricVertexExp);
  }
 
 

diff --git a/source/loader/ze_loader.cpp b/source/loader/ze_loader.cpp
@@ -77,22 +77,22 @@ namespace loader
  }
 
  if(nullptr != validationLayer) {
- auto getTable = reinterpret_cast<ze_pfnGetGlobalProcAddrTable_t>(
+ getTable = reinterpret_cast<ze_pfnGetGlobalProcAddrTable_t>(
  GET_FUNCTION_PTR(validationLayer, "zeGetGlobalProcAddrTable") );
  if(!getTable)
  return ZE_RESULT_ERROR_UNINITIALIZED;
- auto getTableResult = getTable( version, &global);
+ getTableResult = getTable( version, &global);
  if(getTableResult != ZE_RESULT_SUCCESS) {
  return ZE_RESULT_ERROR_UNINITIALIZED;
  }
  }
 
  if(nullptr != tracingLayer) {
- auto getTable = reinterpret_cast<ze_pfnGetGlobalProcAddrTable_t>(
+ getTable = reinterpret_cast<ze_pfnGetGlobalProcAddrTable_t>(
  GET_FUNCTION_PTR(tracingLayer, "zeGetGlobalProcAddrTable") );
  if(!getTable)
  return ZE_RESULT_ERROR_UNINITIALIZED;
- auto getTableResult = getTable( version, &global);
+ getTableResult = getTable( version, &global);
  if(getTableResult != ZE_RESULT_SUCCESS) {
  return ZE_RESULT_ERROR_UNINITIALIZED;
  }
@@ -163,10 +163,10 @@ namespace loader
  {
  auto getVersion = reinterpret_cast<getVersion_t>(
  GET_FUNCTION_PTR(validationLayer, "zelLoaderGetVersion"));
- zel_component_version_t version;
- if(getVersion && ZE_RESULT_SUCCESS == getVersion(&version))
+ zel_component_version_t compVersion;
+ if(getVersion && ZE_RESULT_SUCCESS == getVersion(&compVersion))
  { 
- compVersions.push_back(version);
+ compVersions.push_back(compVersion);
  }
  } else if (debugTraceEnabled) {
  GET_LIBRARY_ERROR(loadLibraryErrorValue);
@@ -184,10 +184,10 @@ namespace loader
  { 
  auto getVersion = reinterpret_cast<getVersion_t>(
  GET_FUNCTION_PTR(tracingLayer, "zelLoaderGetVersion"));
- zel_component_version_t version;
- if(getVersion && ZE_RESULT_SUCCESS == getVersion(&version))
+ zel_component_version_t compVersion;
+ if(getVersion && ZE_RESULT_SUCCESS == getVersion(&compVersion))
  { 
- compVersions.push_back(version);
+ compVersions.push_back(compVersion);
  }
  } else if (debugTraceEnabled) {
  GET_LIBRARY_ERROR(loadLibraryErrorValue);
@@ -256,14 +256,14 @@ namespace loader
  };
 
  void context_t::add_loader_version(){
- zel_component_version_t version = {};
- string_copy_s(version.component_name, LOADER_COMP_NAME, ZEL_COMPONENT_STRING_SIZE);
- version.spec_version = ZE_API_VERSION_CURRENT;
- version.component_lib_version.major = LOADER_VERSION_MAJOR;
- version.component_lib_version.minor = LOADER_VERSION_MINOR;
- version.component_lib_version.patch = LOADER_VERSION_PATCH;
+ zel_component_version_t compVersion = {};
+ string_copy_s(compVersion.component_name, LOADER_COMP_NAME, ZEL_COMPONENT_STRING_SIZE - 1);
+ compVersion.spec_version = ZE_API_VERSION_CURRENT;
+ compVersion.component_lib_version.major = LOADER_VERSION_MAJOR;
+ compVersion.component_lib_version.minor = LOADER_VERSION_MINOR;
+ compVersion.component_lib_version.patch = LOADER_VERSION_PATCH;
 
- compVersions.push_back(version);
+ compVersions.push_back(compVersion);
  }
 
 }
diff --git a/source/loader/zet_ldrddi.cpp b/source/loader/zet_ldrddi.cpp
@@ -2075,7 +2075,6 @@ zetGetMetricGroupExpProcAddrTable(
 
  ze_result_t result = ZE_RESULT_SUCCESS;
 
- bool atLeastOneDriverValid = false;
  // Load the device-driver DDI tables
  for( auto& drv : loader::context->drivers )
  {
@@ -2085,9 +2084,7 @@ zetGetMetricGroupExpProcAddrTable(
  GET_FUNCTION_PTR( drv.handle, "zetGetMetricGroupExpProcAddrTable") );
  if(!getTable) 
  continue; 
- auto getTableResult = getTable( version, &drv.dditable.zet.MetricGroupExp);
- if(getTableResult == ZE_RESULT_SUCCESS) 
- atLeastOneDriverValid = true;
+ result = getTable( version, &drv.dditable.zet.MetricGroupExp);
  }