Skip to content

Commit 196d8e8

Browse files
author
nopandbrk
committed
Add newlines when writing out data from nuri pass
1 parent 5176013 commit 196d8e8

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

lib/DxilPIXPasses/DxilNonUniformResourceIndexInstrumentation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ bool DxilNonUniformResourceIndexInstrumentation::runOnModule(Module &M) {
137137

138138
if (OSOverride != nullptr) {
139139
formatted_raw_ostream FOS(*OSOverride);
140-
FOS << "FoundDynamicIndexingNoNuri";
140+
FOS << "\nFoundDynamicIndexingNoNuri\n";
141141
}
142142
}
143143

tools/clang/unittests/HLSL/PixTest.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,9 +696,7 @@ std::vector<std::string> PixTest::RunDxilNonUniformResourceIndexInstrumentation(
696696
VERIFY_SUCCEEDED(pOptimizer->RunOptimizer(
697697
dxil, Options.data(), Options.size(), &pOptimizedModule, &pText));
698698

699-
if (pText->GetBufferSize() != 0) {
700-
outputText = reinterpret_cast<const char *>(pText->GetBufferPointer());
701-
}
699+
outputText = BlobToUtf8(pText);
702700

703701
const std::string disassembly = Disassemble(pOptimizedModule);
704702
return Tokenize(disassembly, "\n");
@@ -3009,7 +3007,7 @@ void PixTest::TestNuriCase(const char *source, const wchar_t *target,
30093007
bool foundDynamicIndexingNoNuri = false;
30103008
const std::vector<std::string> outputTextLines = Tokenize(outputText, "\n");
30113009
for (const std::string &line : outputTextLines) {
3012-
if (line == "FoundDynamicIndexingNoNuri") {
3010+
if (line.find("FoundDynamicIndexingNoNuri") != std::string::npos) {
30133011
foundDynamicIndexingNoNuri = true;
30143012
break;
30153013
}

0 commit comments

Comments
 (0)