Remove UNUSED_VARIABLE macro

Signed-off-by: Bartosz Dunajski <[email protected]>

Author: BartoszDunajski

level_zero/core/source/builtin/builtin_functions_lib_impl.cpp

@@ -230,7 +230,7 @@ std::unique_ptr<BuiltinFunctionsLibImpl::BuiltinData> BuiltinFunctionsLibImpl::l
     auto builtInCodeType = NEO::DebugManager.flags.RebuildPrecompiledKernels.get() ? BuiltInCodeType::Intermediate : BuiltInCodeType::Binary;
     auto builtInCode = builtInsLib->getBuiltinsLib().getBuiltinCode(builtin, builtInCodeType, *device->getNEODevice());
 
-    ze_result_t res;
+    [[maybe_unused]] ze_result_t res;
     std::unique_ptr<Module> module;
     ze_module_handle_t moduleHandle;
     ze_module_desc_t moduleDesc = {};
@@ -248,7 +248,7 @@ std::unique_ptr<BuiltinFunctionsLibImpl::BuiltinData> BuiltinFunctionsLibImpl::l
     kernelDesc.pKernelName = builtInName;
     res = module->createKernel(&kernelDesc, &kernelHandle);
     DEBUG_BREAK_IF(res != ZE_RESULT_SUCCESS);
-    UNUSED_VARIABLE(res);
+
     kernel.reset(Kernel::fromHandle(kernelHandle));
     return std::unique_ptr<BuiltinData>(new BuiltinData{std::move(module), std::move(kernel)});
 }

level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl_timestamps.h

@@ -77,7 +77,7 @@ struct MockBuiltinFunctionsLibImplTimestamps : BuiltinFunctionsLibImpl {
         kernelDesc.pKernelName = builtInName;
         res = module->createKernel(&kernelDesc, &kernelHandle);
         DEBUG_BREAK_IF(res != ZE_RESULT_SUCCESS);
-        UNUSED_VARIABLE(res);
+
         kernel.reset(Kernel::fromHandle(kernelHandle));
         return std::unique_ptr<BuiltinData>(new MockBuiltinDataTimestamp{std::move(module), std::move(kernel)});
     }

level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp

@@ -51,7 +51,7 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test {
             kernelDesc.pKernelName = builtInName;
             res = module->createKernel(&kernelDesc, &kernelHandle);
             DEBUG_BREAK_IF(res != ZE_RESULT_SUCCESS);
-            UNUSED_VARIABLE(res);
+
             kernel.reset(Kernel::fromHandle(kernelHandle));
 
             return std::unique_ptr<BuiltinData>(new MockBuiltinData{std::move(module), std::move(kernel)});

opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl

@@ -144,7 +144,7 @@ void HardwareCommandsHelper<GfxFamily>::setInterfaceDescriptorOffset(
 }
 
 template <typename GfxFamily>
-void HardwareCommandsHelper<GfxFamily>::programCacheFlushAfterWalkerCommand(LinearStream *commandStream, const CommandQueue &commandQueue, const Kernel *kernel, uint64_t postSyncAddress) {
+void HardwareCommandsHelper<GfxFamily>::programCacheFlushAfterWalkerCommand(LinearStream *commandStream, const CommandQueue &commandQueue, const Kernel *kernel, [[maybe_unused]] uint64_t postSyncAddress) {
     // 1. make sure previous kernel finished
     PipeControlArgs args;
     auto &hardwareInfo = commandQueue.getDevice().getHardwareInfo();
@@ -170,8 +170,6 @@ void HardwareCommandsHelper<GfxFamily>::programCacheFlushAfterWalkerCommand(Line
 
             flushGpuCache<GfxFamily>(commandStream, range, postSyncAddressToFlush, hardwareInfo);
         }
-    } else {
-        UNUSED_VARIABLE(postSyncAddress);
     }
 }
 

opencl/source/kernel/kernel.cpp

@@ -1615,7 +1615,7 @@ cl_int Kernel::setArgImmediate(uint32_t argIndex,
     if (argVal) {
         storeKernelArg(argIndex, NONE_OBJ, nullptr, nullptr, argSize);
 
-        auto crossThreadDataEnd = ptrOffset(crossThreadData, crossThreadDataSize);
+        [[maybe_unused]] auto crossThreadDataEnd = ptrOffset(crossThreadData, crossThreadDataSize);
         const auto &argAsVal = kernelInfo.kernelDescriptor.payloadMappings.explicitArgs[argIndex].as<ArgDescValue>();
         for (const auto &element : argAsVal.elements) {
             DEBUG_BREAK_IF(element.size <= 0);
@@ -1624,7 +1624,6 @@ cl_int Kernel::setArgImmediate(uint32_t argIndex,
             auto pSrc = ptrOffset(argVal, element.sourceOffset);
 
             DEBUG_BREAK_IF(!(ptrOffset(pDst, element.size) <= crossThreadDataEnd));
-            UNUSED_VARIABLE(crossThreadDataEnd);
 
             if (element.sourceOffset < argSize) {
                 size_t maxBytesToCopy = argSize - element.sourceOffset;

shared/source/helpers/debug_helpers.h

@@ -28,8 +28,6 @@
 #endif // _DEBUG
 #endif // !DEBUG_BREAK_IF
 
-#define UNUSED_VARIABLE(x) ((void)(x))
-
 namespace NEO {
 void debugBreak(int line, const char *file);
 [[noreturn]] void abortUnrecoverable(int line, const char *file);

shared/source/helpers/file_io.cpp

@@ -35,9 +35,8 @@ std::unique_ptr<char[]> loadDataFromFile(
         if (ret) {
             // we initialize to all zeroes before reading in data
             memset(ret.get(), 0x00, nsize + 1);
-            auto read = fread(ret.get(), sizeof(unsigned char), nsize, fp);
+            [[maybe_unused]] auto read = fread(ret.get(), sizeof(unsigned char), nsize, fp);
             DEBUG_BREAK_IF(read != nsize);
-            UNUSED_VARIABLE(read);
         } else {
             nsize = 0;
         }

shared/source/os_interface/linux/drm_memory_manager.cpp

@@ -517,19 +517,17 @@ GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryForImageImpl(const A
     drm_i915_gem_create create = {0, 0, 0};
     create.size = allocationData.imgInfo->size;
 
-    auto ret = this->getDrm(allocationData.rootDeviceIndex).ioctl(DRM_IOCTL_I915_GEM_CREATE, &create);
+    [[maybe_unused]] auto ret = this->getDrm(allocationData.rootDeviceIndex).ioctl(DRM_IOCTL_I915_GEM_CREATE, &create);
     DEBUG_BREAK_IF(ret != 0);
-    UNUSED_VARIABLE(ret);
 
     std::unique_ptr<BufferObject, BufferObject::Deleter> bo(new (std::nothrow) BufferObject(&getDrm(allocationData.rootDeviceIndex), create.handle, allocationData.imgInfo->size, maxOsContextCount));
     if (!bo) {
         return nullptr;
     }
     bo->setAddress(gpuRange);
 
-    auto ret2 = bo->setTiling(I915_TILING_Y, static_cast<uint32_t>(allocationData.imgInfo->rowPitch));
+    [[maybe_unused]] auto ret2 = bo->setTiling(I915_TILING_Y, static_cast<uint32_t>(allocationData.imgInfo->rowPitch));
     DEBUG_BREAK_IF(ret2 != true);
-    UNUSED_VARIABLE(ret2);
 
     auto allocation = new DrmAllocation(allocationData.rootDeviceIndex, allocationData.type, bo.get(), nullptr, gpuRange, allocationData.imgInfo->size, MemoryPool::SystemCpuInaccessible);
     allocation->setDefaultGmm(gmm.release());
@@ -635,10 +633,10 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocationFromSharedHandle(o
     auto ret = this->getDrm(properties.rootDeviceIndex).ioctl(DRM_IOCTL_PRIME_FD_TO_HANDLE, &openFd);
 
     if (ret != 0) {
-        int err = errno;
+        [[maybe_unused]] int err = errno;
         PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "ioctl(PRIME_FD_TO_HANDLE) failed with %d. errno=%d(%s)\n", ret, err, strerror(err));
         DEBUG_BREAK_IF(ret != 0);
-        UNUSED_VARIABLE(ret);
+
         return nullptr;
     }
 
@@ -819,9 +817,9 @@ uint64_t DrmMemoryManager::getSystemSharedMemory(uint32_t rootDeviceIndex) {
 
     drm_i915_gem_context_param getContextParam = {};
     getContextParam.param = I915_CONTEXT_PARAM_GTT_SIZE;
-    auto ret = getDrm(rootDeviceIndex).ioctl(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &getContextParam);
+    [[maybe_unused]] auto ret = getDrm(rootDeviceIndex).ioctl(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &getContextParam);
     DEBUG_BREAK_IF(ret != 0);
-    UNUSED_VARIABLE(ret);
+
     uint64_t gpuMemorySize = getContextParam.value;
 
     return std::min(hostMemorySize, gpuMemorySize);
@@ -887,9 +885,8 @@ void DrmMemoryManager::cleanOsHandles(OsHandleStorage &handleStorage, uint32_t r
             if (osHandle->bo) {
                 BufferObject *search = osHandle->bo;
                 search->wait(-1);
-                auto refCount = unreference(search, true);
+                [[maybe_unused]] auto refCount = unreference(search, true);
                 DEBUG_BREAK_IF(refCount != 1u);
-                UNUSED_VARIABLE(refCount);
             }
             delete handleStorage.fragmentStorageData[i].osHandleStorage;
             handleStorage.fragmentStorageData[i].osHandleStorage = nullptr;

shared/source/os_interface/linux/os_context_linux.cpp

@@ -68,10 +68,10 @@ void OsContextLinux::initializeContext() {
             this->drmContextIds.push_back(drmContextId);
 
             if (drm.isPerContextVMRequired()) {
-                auto ret = drm.queryVmId(drmContextId, drmVmId);
+                [[maybe_unused]] auto ret = drm.queryVmId(drmContextId, drmVmId);
                 DEBUG_BREAK_IF(drmVmId == 0);
                 DEBUG_BREAK_IF(ret != 0);
-                UNUSED_VARIABLE(ret);
+
                 UNRECOVERABLE_IF(this->drmVmIds.size() <= deviceIndex);
                 this->drmVmIds[deviceIndex] = drmVmId;
             }

shared/source/utilities/reference_tracked_object.h

@@ -28,9 +28,8 @@ class RefCounter {
     }
 
     void inc() {
-        CT curr = ++val;
+        [[maybe_unused]] CT curr = ++val;
         DEBUG_BREAK_IF(curr < 1);
-        UNUSED_VARIABLE(curr);
     }
 
     bool dec() {