Compiler: Rework options hashes

- Switch from CRC32 to FNV1a32
- Add hash collision detection (if two options result in the same hash in the same AST, an error is triggered)
- Added OptionHash and HashOption to allow to switch in the future

include/NZSL/Ast/SanitizeVisitor.hpp

@@ -20,6 +20,15 @@
 
 namespace nzsl::Ast
 {
+	using OptionHash = std::uint32_t;
+
+	template<typename... Args> constexpr OptionHash HashOption(Args&&... args);
+
+	namespace Literals
+	{
+		constexpr OptionHash operator ""_opt(const char* str, std::size_t length);
+	}
+
 	class NZSL_API SanitizeVisitor final : Cloner
 	{
 		friend class AstTypeExpressionVisitor;
@@ -42,7 +51,7 @@ namespace nzsl::Ast
 			{
 				std::function<bool(std::string& identifier, IdentifierScope identifierScope)> identifierSanitizer; //< ignored when performing partial sanitization
 				std::shared_ptr<ModuleResolver> moduleResolver;
-				std::unordered_map<std::uint32_t, ConstantValue> optionValues;
+				std::unordered_map<OptionHash, ConstantValue> optionValues;
 				bool forceAutoBindingResolve = false;
 				bool makeVariableNameUnique = false;
 				bool partialSanitization = false;

include/NZSL/Ast/SanitizeVisitor.inl

@@ -2,9 +2,24 @@
 // This file is part of the "Nazara Shading Language" project
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <NazaraUtils/Hash.hpp>
 
 namespace nzsl::Ast
 {
+	template<typename... Args>
+	constexpr OptionHash HashOption(Args&&... args)
+	{
+		return Nz::FNV1a32(std::forward<Args>(args)...);
+	}
+
+	namespace Literals
+	{
+		constexpr OptionHash operator""_opt(const char* str, std::size_t length)
+		{
+			return HashOption(std::string_view(str, length));
+		}
+	}
+
 	inline ModulePtr SanitizeVisitor::Sanitize(const Module& module, std::string* error)
 	{
 		return Sanitize(module, {}, error);

include/NZSL/Lang/ErrorList.hpp

@@ -124,6 +124,7 @@ NZSL_SHADERLANG_COMPILER_ERROR(ModuleCompilationFailed, "module {} compilation f
 NZSL_SHADERLANG_COMPILER_ERROR(ModuleFeatureMismatch, "module {} requires feature {}", std::string, Ast::ModuleFeature)
 NZSL_SHADERLANG_COMPILER_ERROR(ModuleNotFound, "module {} not found", std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(NoModuleResolver, "import statement found but no module resolver has been set (and partial sanitization is not enabled)")
+NZSL_SHADERLANG_COMPILER_ERROR(OptionHashCollision, "option {} has the same hash as option {}", std::string, std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(OptionDeclarationInsideFunction, "options must be declared outside of functions")
 NZSL_SHADERLANG_COMPILER_ERROR(PartialTypeExpect, "expected a {} type at #{}", std::string, std::uint32_t)
 NZSL_SHADERLANG_COMPILER_ERROR(PartialTypeTooFewParameters, "parameter count mismatch (expected at least {}, got {})", std::uint32_t, std::uint32_t)

src/NZSL/Ast/SanitizeVisitor.cpp

@@ -194,6 +194,7 @@ namespace nzsl::Ast
 		std::unordered_map<std::string, std::size_t> moduleByName;
 		std::unordered_map<std::uint64_t, UsedExternalData> usedBindingIndexes;
 		std::unordered_map<std::string, UsedExternalData> declaredExternalVar;
+		std::unordered_map<OptionHash, std::string> declaredOptions;
 		std::shared_ptr<Environment> globalEnv;
 		std::shared_ptr<Environment> currentEnv;
 		std::shared_ptr<Environment> moduleEnv;
@@ -1750,7 +1751,16 @@ namespace nzsl::Ast
 
 		clone->optType = std::move(resolvedType);
 
-		std::uint32_t optionHash = Nz::CRC32(reinterpret_cast<const std::uint8_t*>(clone->optName.data()), clone->optName.size());
+		OptionHash optionHash = HashOption(clone->optName.data());
+
+		// Detect hash collisions
+		if (auto it = m_context->declaredOptions.find(optionHash); it != m_context->declaredOptions.end())
+		{
+			if (it->second != clone->optName)
+				throw CompilerOptionHashCollisionError{ node.sourceLocation, clone->optName, it->second };
+		}
+		else
+			m_context->declaredOptions.emplace(optionHash, clone->optName);
 
 		if (auto optionValueIt = m_context->options.optionValues.find(optionHash); optionValueIt != m_context->options.optionValues.end())
 			clone->optIndex = RegisterConstant(clone->optName, optionValueIt->second, node.optIndex, node.sourceLocation);

tests/src/Tests/ConstTests.cpp

@@ -99,7 +99,9 @@ fn main()
 
 		WHEN("Enabling option")
 		{
-			options.optionValues[Nz::CRC32("UseInt")] = true;
+			using namespace nzsl::Ast::Literals;
+
+			options.optionValues["UseInt"_opt] = true;
 
 			ExpectOutput(*shaderModule, options, R"(
 struct inputStruct
@@ -123,7 +125,9 @@ fn main()
 
 		WHEN("Disabling option")
 		{
-			options.optionValues[Nz::CRC32("UseInt")] = false;
+			using namespace nzsl::Ast::Literals;
+
+			options.optionValues["UseInt"_opt] = false;
 
 			ExpectOutput(*shaderModule, options, R"(
 struct inputStruct