Raise MSVC warning level from /W3 to /W4

This patch increases the warning level when using the MSVC compiler from
`/W3` to `/W4` and fixes the issues found. Four warnings introduced by
`/W4` are disabled, all related to variable name shadowing, as they
overly prescriptive to valid code.

Author: kbenzie

cmake/helpers.cmake

@@ -82,18 +82,25 @@ function(add_ur_target_compile_options name)
     elseif(MSVC)
         target_compile_options(${name} PRIVATE
             $<$<CXX_COMPILER_ID:MSVC>:/MP>  # clang-cl.exe does not support /MP
-            /W3
+            /W4
+            /wd4456  # Disable: declaration of 'identifier' hides previous local declaration
+            /wd4457  # Disable: declaration of 'identifier' hides function parameter
+            /wd4458  # Disable: declaration of 'identifier' hides class member
+            /wd4459  # Disable: declaration of 'identifier' hides global declaration
             /MD$<$<CONFIG:Debug>:d>
             /GS
             /DWIN32_LEAN_AND_MEAN
             /DNOMINMAX
         )
 
-        if(UR_DEVELOPER_MODE)
+        target_compile_definitions(${name} PRIVATE
             # _CRT_SECURE_NO_WARNINGS used mainly because of getenv
-            # C4267: The compiler detected a conversion from size_t to a smaller type.
+            _CRT_SECURE_NO_WARNINGS
+        )
+
+        if(UR_DEVELOPER_MODE)
             target_compile_options(${name} PRIVATE
-                /WX /GS /D_CRT_SECURE_NO_WARNINGS /wd4267
+                /WX /GS
             )
         endif()
     endif()

examples/collector/collector.cpp

@@ -25,7 +25,14 @@
 #include <string_view>
 
 #include "ur_api.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4245)
+#endif
 #include "xpti/xpti_trace_framework.h"
+#ifdef _MSC_VER
+#pragma warning(default : 4245)
+#endif
 
 constexpr uint16_t TRACE_FN_BEGIN =
     static_cast<uint16_t>(xpti::trace_point_type_t::function_with_args_begin);

include/ur_api.h

@@ -422,7 +422,7 @@ typedef struct ur_physical_mem_handle_t_ *ur_physical_mem_handle_t;
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef UR_BIT
 /// @brief Generic macro for enumerator bit masks
-#define UR_BIT(_i) (1 << _i)
+#define UR_BIT(_i) (1U << _i)
 #endif // UR_BIT
 
 ///////////////////////////////////////////////////////////////////////////////

scripts/core/common.yml

@@ -134,7 +134,7 @@ name: "$x_physical_mem_handle_t"
 type: macro
 desc: "Generic macro for enumerator bit masks"
 name: "$X_BIT( _i )"
-value: "( 1 << _i )"
+value: "( 1U << _i )"
 --- #--------------------------------------------------------------------------
 type: enum
 desc: "Defines Return/Error codes"

source/adapters/level_zero/CMakeLists.txt

@@ -65,7 +65,7 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
 
     target_compile_options(ze_loader PRIVATE
         $<$<IN_LIST:$<CXX_COMPILER_ID>,GNU;Clang;Intel;IntelLLVM>:-Wno-error>
-        $<$<CXX_COMPILER_ID:MSVC>:/WX- /UUNICODE>
+        $<$<CXX_COMPILER_ID:MSVC>:/UUNICODE>
     )
 
     set(LEVEL_ZERO_LIBRARY ze_loader)
@@ -163,8 +163,9 @@ if(UR_BUILD_ADAPTER_L0)
     endif()
 
     # TODO: fix level_zero adapter conversion warnings
+    # C4267: The compiler detected a conversion from size_t to a smaller type.
     target_compile_options(ur_adapter_level_zero PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/wd4805 /wd4244>
+        $<$<CXX_COMPILER_ID:MSVC>:/wd4805 /wd4244 /wd4267>
     )
 
     set_target_properties(ur_adapter_level_zero PROPERTIES
@@ -256,7 +257,7 @@ if(UR_BUILD_ADAPTER_L0_V2)
 
     # TODO: fix level_zero adapter conversion warnings
     target_compile_options(ur_adapter_level_zero_v2 PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/wd4805 /wd4244>
+        $<$<CXX_COMPILER_ID:MSVC>:/wd4805 /wd4244 /wd4100 /wd4267>
     )
 
     set_target_properties(ur_adapter_level_zero_v2 PROPERTIES

source/adapters/level_zero/adapter.cpp

@@ -450,7 +450,5 @@ ur_result_t urAdapterGetInfo(ur_adapter_handle_t, ur_adapter_info_t PropName,
   default:
     return UR_RESULT_ERROR_INVALID_ENUMERATION;
   }
-
-  return UR_RESULT_SUCCESS;
 }
 } // namespace ur::level_zero

source/adapters/level_zero/context.cpp

@@ -756,7 +756,7 @@ ur_result_t ur_context_handle_t_::getAvailableCommandList(
         // queue's map to hold the fence and other associated command
         // list information.
         auto &QGroup = Queue->getQueueGroup(UseCopyEngine);
-        uint32_t QueueGroupOrdinal;
+        uint32_t QueueGroupOrdinal = 0;
         auto &ZeCommandQueue = ForcedCmdQueue
                                    ? *ForcedCmdQueue
                                    : QGroup.getZeQueue(&QueueGroupOrdinal);

source/adapters/level_zero/device.cpp

@@ -155,7 +155,7 @@ ur_result_t urDeviceGet(
     }
   }
 
-  uint32_t ZeDeviceCount = MatchedDevices.size();
+  uint32_t ZeDeviceCount = static_cast<uint32_t>(MatchedDevices.size());
 
   auto N = (std::min)(ZeDeviceCount, NumEntries);
   if (Devices)
@@ -318,9 +318,10 @@ ur_result_t urDeviceGetInfo(
         Device->QueueGroup[ur_device_handle_t_::queue_group_info_t::Compute]
             .ZeIndex >= 0;
     if (RepresentsCSlice)
-      MaxComputeUnits /= Device->RootDevice->SubDevices.size();
+      MaxComputeUnits /=
+          static_cast<uint32_t>(Device->RootDevice->SubDevices.size());
 
-    return ReturnValue(uint32_t{MaxComputeUnits});
+    return ReturnValue(MaxComputeUnits);
   }
   case UR_DEVICE_INFO_MAX_WORK_ITEM_DIMENSIONS:
     // Level Zero spec defines only three dimensions
@@ -422,7 +423,8 @@ ur_result_t urDeviceGetInfo(
       return Res;
     }
 
-    uint32_t ZeSubDeviceCount = Device->SubDevices.size();
+    uint32_t ZeSubDeviceCount =
+        static_cast<uint32_t>(Device->SubDevices.size());
     if (pSize && ZeSubDeviceCount < 2) {
       *pSize = 0;
       return UR_RESULT_SUCCESS;
@@ -1151,8 +1153,6 @@ ur_result_t urDeviceGetInfo(
                   logger::toHex(ParamName));
     return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
   }
-
-  return UR_RESULT_SUCCESS;
 }
 
 bool CopyEngineRequested(const ur_device_handle_t &Device) {
@@ -1200,7 +1200,7 @@ ur_result_t urDevicePartition(
     return Res;
   }
 
-  auto EffectiveNumDevices = [&]() -> decltype(Device->SubDevices.size()) {
+  auto EffectiveNumDevices = [&]() -> uint32_t {
     if (Device->SubDevices.size() == 0)
       return 0;
 
@@ -1223,7 +1223,7 @@ ur_result_t urDevicePartition(
       }
     }
 
-    return Device->SubDevices.size();
+    return static_cast<uint32_t>(Device->SubDevices.size());
   }();
 
   // TODO: Consider support for partitioning to <= total sub-devices.

source/adapters/level_zero/event.cpp

@@ -494,8 +494,6 @@ ur_result_t urEventGetInfo(
         PropName, logger::toHex(PropName));
     return UR_RESULT_ERROR_INVALID_VALUE;
   }
-
-  return UR_RESULT_SUCCESS;
 }
 
 ur_result_t urEventGetProfilingInfo(

source/adapters/level_zero/platform.cpp

@@ -99,8 +99,6 @@ ur_result_t urPlatformGetInfo(
     logger::debug("urPlatformGetInfo: unrecognized ParamName");
     return UR_RESULT_ERROR_INVALID_VALUE;
   }
-
-  return UR_RESULT_SUCCESS;
 }
 
 ur_result_t urPlatformGetApiVersion(