Refactor CountingPushData into CountingParameters and userspace CountingPushData

Author: nipunG314

CountingSort/app_resources/common.hlsl

@@ -0,0 +1,21 @@
+// Copyright (C) 2018-2024 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+
+#ifndef _COUNTING_SORT_COMMON_INCLUDED_
+#define _COUNTING_SORT_COMMON_INCLUDED_
+
+struct CountingPushData
+{
+    uint64_t inputKeyAddress;
+    uint64_t inputValueAddress;
+    uint64_t scratchAddress;
+    uint64_t outputKeyAddress;
+    uint64_t outputValueAddress;
+    uint32_t dataElementCount;
+    uint32_t elementsPerWT;
+    uint32_t minimum;
+    uint32_t maximum;
+};
+
+#endif

CountingSort/app_resources/prefix_sum_shader.comp.hlsl

@@ -1,8 +1,8 @@
 #include "nbl/builtin/hlsl/bda/__ptr.hlsl"
 #include "nbl/builtin/hlsl/sort/counting.hlsl"
-#include "nbl/builtin/hlsl/sort/common.hlsl"
+#include "app_resources/common.hlsl"
 
-[[vk::push_constant]] nbl::hlsl::sort::CountingPushData pushData;
+[[vk::push_constant]] CountingPushData pushData;
 
 struct PtrAccessor
 {
@@ -42,12 +42,12 @@ uint32_t3 nbl::hlsl::glsl::gl_WorkGroupSize()
 [numthreads(WorkgroupSize,1,1)]
 void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
 {
-    nbl::hlsl::sort::counting <PtrAccessor, PtrAccessor, PtrAccessor> counter;
+    nbl::hlsl::sort::counting <uint32_t, PtrAccessor, PtrAccessor, PtrAccessor> counter;
     PtrAccessor input_accessor = PtrAccessor::create(pushData.inputKeyAddress);
     PtrAccessor scratch_accessor = PtrAccessor::create(pushData.scratchAddress);
-    counter.histogram(
+    /*counter.histogram(
         input_accessor,
         scratch_accessor,
         pushData
-    );
+    );*/
 }

CountingSort/app_resources/scatter_shader.comp.hlsl

@@ -1,8 +1,8 @@
 #include "nbl/builtin/hlsl/bda/__ptr.hlsl"
 #include "nbl/builtin/hlsl/sort/counting.hlsl"
-#include "nbl/builtin/hlsl/sort/common.hlsl"
+#include "app_resources/common.hlsl"
 
-[[vk::push_constant]] nbl::hlsl::sort::CountingPushData pushData;
+[[vk::push_constant]] CountingPushData pushData;
 
 struct PtrAccessor
 {
@@ -67,14 +67,14 @@ uint32_t3 nbl::hlsl::glsl::gl_WorkGroupSize()
 [numthreads(WorkgroupSize, 1, 1)]
 void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
 {
-    nbl::hlsl::sort::counting <DoublePtrAccessor, DoublePtrAccessor, PtrAccessor> counter;
+    nbl::hlsl::sort::counting <uint32_t, DoublePtrAccessor, DoublePtrAccessor, PtrAccessor> counter;
     DoublePtrAccessor key_accessor = DoublePtrAccessor::create(pushData.inputKeyAddress, pushData.outputKeyAddress);
     DoublePtrAccessor value_accessor = DoublePtrAccessor::create(pushData.inputValueAddress, pushData.outputValueAddress);
     PtrAccessor scratch_accessor = PtrAccessor::create(pushData.scratchAddress);
-    counter.scatter(
+    /*counter.scatter(
         key_accessor,
         value_accessor,
         scratch_accessor,
         pushData
-    );
+    );*/
 }

CountingSort/main.cpp

@@ -7,7 +7,7 @@ using namespace system;
 using namespace asset;
 using namespace video;
 
-#include "nbl/builtin/hlsl/sort/common.hlsl"
+#include "app_resources/common.hlsl"
 #include "nbl/builtin/hlsl/bit.hlsl"
 
 class CountingSortApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
@@ -89,7 +89,7 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
 		}
 
 		// People love Reflection but I prefer Shader Sources instead!
-		const nbl::asset::SPushConstantRange pcRange = { .stageFlags = IShader::ESS_COMPUTE,.offset = 0,.size = sizeof(nbl::hlsl::sort::CountingPushData) };
+		const nbl::asset::SPushConstantRange pcRange = { .stageFlags = IShader::ESS_COMPUTE,.offset = 0,.size = sizeof(CountingPushData) };
 
 		// This time we'll have no Descriptor Sets or Layouts because our workload has a widely varying size
 		// and using traditional SSBO bindings would force us to update the Descriptor Set every frame.
@@ -171,6 +171,7 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
 
 		// Generate random data
 		constexpr uint32_t minimum = 0;
+		constexpr uint32_t maximum = 10000;
 		const uint32_t range = bucket_count;
 		unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
 		std::mt19937 g(seed);
@@ -202,15 +203,16 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
 		outBuffer.append("\n");
 		m_logger->log("Your input array is: \n" + outBuffer, ILogger::ELL_PERFORMANCE);
 
-		auto pc = nbl::hlsl::sort::CountingPushData {
+		auto pc = CountingPushData {
 			.inputKeyAddress = buffer_device_address[0],
 			.inputValueAddress = buffer_device_address[1],
 			.scratchAddress = buffer_device_address[2],
 			.outputKeyAddress = buffer_device_address[3],
 			.outputValueAddress = buffer_device_address[4],
 			.dataElementCount = element_count,
+			.elementsPerWT = elements_per_thread,
 			.minimum = minimum,
-			.elementsPerWT = elements_per_thread
+			.maximum = maximum,
 		};
 
 		smart_refctd_ptr<nbl::video::IGPUCommandBuffer> cmdBuf;