Skip to content

Commit 7840e13

Browse files
MaciejKalinskiigcbot
authored andcommitted
remove RTMemoryStyleOptions regkey
The key is useless now, as we cannot freely choose the memory style in IGC.
1 parent 85512dd commit 7840e13

File tree

3 files changed

+2
-51
lines changed

3 files changed

+2
-51
lines changed

IGC/AdaptorCommon/RayTracing/RayTracingInterface.cpp

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -119,54 +119,12 @@ static void setupRegionBTIs(CodeGenContext* pContext)
119119
}
120120
}
121121

122-
static constexpr uint32_t numRegkey()
123-
{
124-
uint32_t i = 0;
125-
#define RTMEMORY_STYLE_OPTION(Name, Val) i++;
126-
#include "igc_regkeys_enums_defs.h"
127-
RTMEMORY_STYLE_OPTIONS
128-
#undef RTMEMORY_STYLE_OPTION
129-
#undef RTMEMORY_STYLE_OPTIONS
130-
return i;
131-
}
132-
133-
static constexpr uint32_t numLayouts()
134-
{
135-
uint32_t i = 0;
136-
#define STYLE(X) i++;
137-
#include "RayTracingMemoryStyle.h"
138-
#undef STYLE
139-
return i;
140-
}
141-
142122
static void setupRTMemoryStyle(CodeGenContext* pContext)
143123
{
144-
static_assert(numRegkey() == numLayouts() + 1, "add the key!");
145-
enum class StyleOptions
146-
{
147-
#define RTMEMORY_STYLE_OPTION(Name, Val) Name = Val,
148-
#include "igc_regkeys_enums_defs.h"
149-
RTMEMORY_STYLE_OPTIONS
150-
#undef RTMEMORY_STYLE_OPTION
151-
#undef RTMEMORY_STYLE_OPTIONS
152-
};
153-
154-
auto Style = StyleOptions(IGC_GET_FLAG_VALUE(RTMemoryStyleOptions));
155-
156124
auto& rtInfo = pContext->getModuleMetaData()->rtInfo;
157125

158-
switch (Style)
159-
{
160-
case StyleOptions::Auto:
161-
rtInfo.MemStyle = RTMemoryStyle::Xe;
162-
break;
163-
#define STYLE(X) \
164-
case StyleOptions::X: \
165-
rtInfo.MemStyle = RTMemoryStyle::X; \
166-
break;
167-
#include "RayTracingMemoryStyle.h"
168-
#undef STYLE
169-
}
126+
rtInfo.MemStyle = RTMemoryStyle::Xe;
127+
170128
}
171129

172130

IGC/common/igc_flags.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,6 @@ DECLARE_IGC_GROUP("Raytracing Options")
946946
DECLARE_IGC_REGKEY(DWORD, RetryRTPickBetterThreshold, 10, "Only pick the retry shader if the spill cost of the 2nd compilation is at least this percentage better than the previous compilation", false)
947947
DECLARE_IGC_REGKEY(bool, EnableFillScheduling, false, "Schedule fills for reduced register pressure", false)
948948
DECLARE_IGC_REGKEY(bool, DisableSWStackOffsetElision, false, "Avoid loading offseting when known at compile-time", false)
949-
DECLARE_IGC_REGKEY_ENUM(RTMemoryStyleOptions, -1, "Select layout of RT memory", RTMEMORY_STYLE_OPTIONS, true)
950949
DECLARE_IGC_REGKEY(DWORD, OverrideTMax, 0, "Force TMax to the given value. When 0, do nothing.", false)
951950

952951
DECLARE_IGC_GROUP("VectorCompiler Options")

IGC/common/igc_regkeys_enums_defs.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,3 @@ SPDX-License-Identifier: MIT
101101
TRIBOOL_OPTION(Enabled, 1)
102102
#endif // TRIBOOL_OPTION
103103

104-
#ifdef RTMEMORY_STYLE_OPTION
105-
#define RTMEMORY_STYLE_OPTIONS \
106-
RTMEMORY_STYLE_OPTION(Auto, -1) \
107-
RTMEMORY_STYLE_OPTION(Xe, 0)
108-
#endif // RTMEMORY_STYLE_OPTION
109-

0 commit comments

Comments
 (0)