Added OpIAddCarry and OpISubBorrow intrinsics

Author: Przemog1

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -4,13 +4,13 @@
 #ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_CORE_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_CORE_INCLUDED_
 
-
 #ifdef __HLSL_VERSION // TODO: AnastZIuk fix public search paths so we don't choke
 #include "spirv/unified1/spirv.hpp"
 
 #include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl>
-#include "nbl/builtin/hlsl/type_traits.hlsl"
+#include <nbl/builtin/hlsl/type_traits.hlsl>
 #include <nbl/builtin/hlsl/concepts.hlsl>
+#include <nbl/builtin/hlsl/spirv_intrinsics/output_structs.hlsl>
 
 namespace nbl 
 {
@@ -300,6 +300,14 @@ template<typename BooleanVector>
 [[vk::ext_instruction(spv::OpAny)]]
 enable_if_t<is_vector_v<BooleanVector>&& is_same_v<typename vector_traits<BooleanVector>::scalar_type, bool>, BooleanVector> any(BooleanVector vec);
 
+template<typename T NBL_FUNC_REQUIRES(concepts::UnsignedIntegral<T>)
+[[vk::ext_instruction(spv::OpIAddCarry)]]
+AddCarryOutput<T> AddCarry(T operand1, T operand2);
+
+template<typename T NBL_FUNC_REQUIRES(concepts::UnsignedIntegral<T>)
+[[vk::ext_instruction(spv::OpISubBorrow)]]
+SubBorrowOutput<T> SubBorrow(T operand1, T operand2);
+
 }
 
 #endif

include/nbl/builtin/hlsl/spirv_intrinsics/output_structs.hlsl

@@ -0,0 +1,36 @@
+// Copyright (C) 2023 - 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 _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_OUTPUT_STRUCTS_INCLUDED_
+#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_OUTPUT_STRUCTS_INCLUDED_
+
+#include <nbl/builtin/hlsl/concepts/core.hlsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+
+template<typename T NBL_STRUCT_CONSTRAINABLE>
+struct AddCarryOutput;
+template<typename T NBL_STRUCT_CONSTRAINABLE>
+struct SubBorrowOutput;
+
+
+template<typename T>  NBL_PARTIAL_REQ_TOP(concepts::UnsignedIntegral<T>)
+struct AddCarryOutput<T NBL_PARTIAL_REQ_BOT(concepts::UnsignedIntegral<T>) >
+{
+	T result;
+	T carry;
+};
+
+template<typename T>  NBL_PARTIAL_REQ_TOP(concepts::UnsignedIntegral<T>)
+struct SubBorrowOutput<T NBL_PARTIAL_REQ_BOT(concepts::UnsignedIntegral<T>) >
+{
+	T result;
+	T borrow;
+};
+}
+}
+
+#endif

include/nbl/builtin/hlsl/tgmath/output_structs.hlsl

@@ -1,8 +1,8 @@
 // Copyright (C) 2023 - 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 _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_OUTPUT_STRUCTS_INCLUDED_
-#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_OUTPUT_STRUCTS_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_TGMATH_SPIRV_INTRINSICS_OUTPUT_STRUCTS_INCLUDED_
+#define _NBL_BUILTIN_HLSL_TGMATH_SPIRV_INTRINSICS_OUTPUT_STRUCTS_INCLUDED_
 
 #include <nbl/builtin/hlsl/concepts/core.hlsl>
 #include <nbl/builtin/hlsl/concepts/vector.hlsl>

src/nbl/builtin/CMakeLists.txt

@@ -238,6 +238,7 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_bas
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_shuffle.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_vote.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/glsl.std.450.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/output_structs.hlsl")
 #C++ compatibility
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/basic.h")