Revert "Add support for PSV EntryFunctionName (#84409)" #86211
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit cde54df.
llvmbot
added
mc
|
@llvm/pr-subscribers-backend-directx @llvm/pr-subscribers-mc Author: Cooper Partin (coopp) ChangesThis reverts commit cde54df. Patch is 41.59 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/86211.diff 18 Files Affected:
diff --git a/llvm/include/llvm/BinaryFormat/DXContainer.h b/llvm/include/llvm/BinaryFormat/DXContainer.h
index ba882c4a6f328c..532f9481766a95 100644
--- a/llvm/include/llvm/BinaryFormat/DXContainer.h
+++ b/llvm/include/llvm/BinaryFormat/DXContainer.h
@@ -424,19 +424,6 @@ struct ResourceBindInfo : public v0::ResourceBindInfo {
};
} // namespace v2
-
-namespace v3 {
-struct RuntimeInfo : public v2::RuntimeInfo {
- uint32_t EntryNameOffset;
-
- void swapBytes() { sys::swapByteOrder(EntryNameOffset); }
-
- void swapBytes(Triple::EnvironmentType Stage) {
- v2::RuntimeInfo::swapBytes(Stage);
- }
-};
-
-} // namespace v3
} // namespace PSV
#define COMPONENT_PRECISION(Val, Enum) Enum = Val,
diff --git a/llvm/include/llvm/MC/DXContainerPSVInfo.h b/llvm/include/llvm/MC/DXContainerPSVInfo.h
index bad2fe78eb8fbb..7d21c18d252f1c 100644
--- a/llvm/include/llvm/MC/DXContainerPSVInfo.h
+++ b/llvm/include/llvm/MC/DXContainerPSVInfo.h
@@ -9,11 +9,9 @@
#ifndef LLVM_MC_DXCONTAINERPSVINFO_H
#define LLVM_MC_DXCONTAINERPSVINFO_H
-#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/BinaryFormat/DXContainer.h"
-#include "llvm/MC/StringTableBuilder.h"
#include "llvm/TargetParser/Triple.h"
#include <array>
@@ -47,9 +45,8 @@ struct PSVSignatureElement {
// modifiable format, and can be used to serialize the data back into valid PSV
// RuntimeInfo.
struct PSVRuntimeInfo {
- PSVRuntimeInfo() : DXConStrTabBuilder(StringTableBuilder::DXContainer) {}
bool IsFinalized = false;
- dxbc::PSV::v3::RuntimeInfo BaseData;
+ dxbc::PSV::v2::RuntimeInfo BaseData;
SmallVector<dxbc::PSV::v2::ResourceBindInfo> Resources;
SmallVector<PSVSignatureElement> InputElements;
SmallVector<PSVSignatureElement> OutputElements;
@@ -67,7 +64,6 @@ struct PSVRuntimeInfo {
std::array<SmallVector<uint32_t>, 4> InputOutputMap;
SmallVector<uint32_t> InputPatchMap;
SmallVector<uint32_t> PatchOutputMap;
- llvm::StringRef EntryName;
// Serialize PSVInfo into the provided raw_ostream. The version field
// specifies the data version to encode, the default value specifies encoding
@@ -75,12 +71,19 @@ struct PSVRuntimeInfo {
void write(raw_ostream &OS,
uint32_t Version = std::numeric_limits<uint32_t>::max()) const;
- void finalize(Triple::EnvironmentType Stage);
-
-private:
- SmallVector<uint32_t, 64> IndexBuffer;
- SmallVector<llvm::dxbc::PSV::v0::SignatureElement, 32> SignatureElements;
- StringTableBuilder DXConStrTabBuilder;
+ void finalize(Triple::EnvironmentType Stage) {
+ IsFinalized = true;
+ BaseData.SigInputElements = static_cast<uint32_t>(InputElements.size());
+ BaseData.SigOutputElements = static_cast<uint32_t>(OutputElements.size());
+ BaseData.SigPatchOrPrimElements =
+ static_cast<uint32_t>(PatchOrPrimElements.size());
+ if (!sys::IsBigEndianHost)
+ return;
+ BaseData.swapBytes();
+ BaseData.swapBytes(Stage);
+ for (auto &Res : Resources)
+ Res.swapBytes();
+ }
};
class Signature {
diff --git a/llvm/include/llvm/MC/StringTableBuilder.h b/llvm/include/llvm/MC/StringTableBuilder.h
index a738683548cfa5..4ee421e22c171f 100644
--- a/llvm/include/llvm/MC/StringTableBuilder.h
+++ b/llvm/include/llvm/MC/StringTableBuilder.h
@@ -74,8 +74,12 @@ class StringTableBuilder {
/// Check if a string is contained in the string table. Since this class
/// doesn't store the string values, this function can be used to check if
/// storage needs to be done prior to adding the string.
- bool contains(StringRef S) const { return contains(CachedHashStringRef(S)); }
- bool contains(CachedHashStringRef S) const { return StringIndexMap.count(S); }
+ bool contains(StringRef S) const {
+ return contains(CachedHashStringRef(S));
+ }
+ bool contains(CachedHashStringRef S) const {
+ return StringIndexMap.count(S);
+ }
size_t getSize() const { return Size; }
void clear();
diff --git a/llvm/include/llvm/Object/DXContainer.h b/llvm/include/llvm/Object/DXContainer.h
index 19c83ba6c6e85d..b6e3d321da2461 100644
--- a/llvm/include/llvm/Object/DXContainer.h
+++ b/llvm/include/llvm/Object/DXContainer.h
@@ -125,8 +125,7 @@ class PSVRuntimeInfo {
uint32_t Size;
using InfoStruct =
std::variant<std::monostate, dxbc::PSV::v0::RuntimeInfo,
- dxbc::PSV::v1::RuntimeInfo, dxbc::PSV::v2::RuntimeInfo,
- dxbc::PSV::v3::RuntimeInfo>;
+ dxbc::PSV::v1::RuntimeInfo, dxbc::PSV::v2::RuntimeInfo>;
InfoStruct BasicInfo;
ResourceArray Resources;
StringRef StringTable;
@@ -152,11 +151,9 @@ class PSVRuntimeInfo {
ResourceArray getResources() const { return Resources; }
uint32_t getVersion() const {
- return Size >= sizeof(dxbc::PSV::v3::RuntimeInfo)
- ? 3
- : (Size >= sizeof(dxbc::PSV::v2::RuntimeInfo) ? 2
- : (Size >= sizeof(dxbc::PSV::v1::RuntimeInfo)) ? 1
- : 0);
+ return Size >= sizeof(dxbc::PSV::v2::RuntimeInfo)
+ ? 2
+ : (Size >= sizeof(dxbc::PSV::v1::RuntimeInfo) ? 1 : 0);
}
uint32_t getResourceStride() const { return Resources.Stride; }
@@ -164,11 +161,6 @@ class PSVRuntimeInfo {
const InfoStruct &getInfo() const { return BasicInfo; }
template <typename T> const T *getInfoAs() const {
- if (const auto *P = std::get_if<dxbc::PSV::v3::RuntimeInfo>(&BasicInfo))
- return static_cast<const T *>(P);
- if (std::is_same<T, dxbc::PSV::v3::RuntimeInfo>::value)
- return nullptr;
-
if (const auto *P = std::get_if<dxbc::PSV::v2::RuntimeInfo>(&BasicInfo))
return static_cast<const T *>(P);
if (std::is_same<T, dxbc::PSV::v2::RuntimeInfo>::value)
diff --git a/llvm/include/llvm/ObjectYAML/DXContainerYAML.h b/llvm/include/llvm/ObjectYAML/DXContainerYAML.h
index 9c4d9e19f11ba3..f7f8d5e6bf4722 100644
--- a/llvm/include/llvm/ObjectYAML/DXContainerYAML.h
+++ b/llvm/include/llvm/ObjectYAML/DXContainerYAML.h
@@ -107,7 +107,7 @@ struct PSVInfo {
// the format.
uint32_t Version;
- dxbc::PSV::v3::RuntimeInfo Info;
+ dxbc::PSV::v2::RuntimeInfo Info;
uint32_t ResourceStride;
SmallVector<ResourceBindInfo> Resources;
SmallVector<SignatureElement> SigInputElements;
@@ -121,15 +121,12 @@ struct PSVInfo {
MaskVector InputPatchMap;
MaskVector PatchOutputMap;
- StringRef EntryName;
-
void mapInfoForVersion(yaml::IO &IO);
PSVInfo();
PSVInfo(const dxbc::PSV::v0::RuntimeInfo *P, uint16_t Stage);
PSVInfo(const dxbc::PSV::v1::RuntimeInfo *P);
PSVInfo(const dxbc::PSV::v2::RuntimeInfo *P);
- PSVInfo(const dxbc::PSV::v3::RuntimeInfo *P, StringRef StringTable);
};
struct SignatureParameter {
diff --git a/llvm/lib/MC/DXContainerPSVInfo.cpp b/llvm/lib/MC/DXContainerPSVInfo.cpp
index aeff6938013977..48182fcd31df06 100644
--- a/llvm/lib/MC/DXContainerPSVInfo.cpp
+++ b/llvm/lib/MC/DXContainerPSVInfo.cpp
@@ -81,18 +81,13 @@ void PSVRuntimeInfo::write(raw_ostream &OS, uint32_t Version) const {
BindingSize = sizeof(dxbc::PSV::v0::ResourceBindInfo);
break;
case 2:
- InfoSize = sizeof(dxbc::PSV::v2::RuntimeInfo);
- BindingSize = sizeof(dxbc::PSV::v2::ResourceBindInfo);
- break;
- case 3:
default:
- InfoSize = sizeof(dxbc::PSV::v3::RuntimeInfo);
+ InfoSize = sizeof(dxbc::PSV::v2::RuntimeInfo);
BindingSize = sizeof(dxbc::PSV::v2::ResourceBindInfo);
}
-
// Write the size of the info.
- support::endian::write(OS, InfoSize, llvm::endianness::little);
+ support::endian::write(OS, InfoSize, llvm::endianness::little);
// Write the info itself.
OS.write(reinterpret_cast<const char *>(&BaseData), InfoSize);
@@ -109,12 +104,32 @@ void PSVRuntimeInfo::write(raw_ostream &OS, uint32_t Version) const {
if (Version == 0)
return;
- support::endian::write(OS,
- static_cast<uint32_t>(DXConStrTabBuilder.getSize()),
+ StringTableBuilder StrTabBuilder((StringTableBuilder::DXContainer));
+ SmallVector<uint32_t, 64> IndexBuffer;
+ SmallVector<v0::SignatureElement, 32> SignatureElements;
+ SmallVector<StringRef, 32> SemanticNames;
+
+ ProcessElementList(StrTabBuilder, IndexBuffer, SignatureElements,
+ SemanticNames, InputElements);
+ ProcessElementList(StrTabBuilder, IndexBuffer, SignatureElements,
+ SemanticNames, OutputElements);
+ ProcessElementList(StrTabBuilder, IndexBuffer, SignatureElements,
+ SemanticNames, PatchOrPrimElements);
+
+ StrTabBuilder.finalize();
+ for (auto ElAndName : zip(SignatureElements, SemanticNames)) {
+ v0::SignatureElement &El = std::get<0>(ElAndName);
+ StringRef Name = std::get<1>(ElAndName);
+ El.NameOffset = static_cast<uint32_t>(StrTabBuilder.getOffset(Name));
+ if (sys::IsBigEndianHost)
+ El.swapBytes();
+ }
+
+ support::endian::write(OS, static_cast<uint32_t>(StrTabBuilder.getSize()),
llvm::endianness::little);
// Write the string table.
- DXConStrTabBuilder.write(OS);
+ StrTabBuilder.write(OS);
// Write the index table size, then table.
support::endian::write(OS, static_cast<uint32_t>(IndexBuffer.size()),
@@ -147,46 +162,6 @@ void PSVRuntimeInfo::write(raw_ostream &OS, uint32_t Version) const {
llvm::endianness::little);
}
-void PSVRuntimeInfo::finalize(Triple::EnvironmentType Stage) {
- IsFinalized = true;
- BaseData.SigInputElements = static_cast<uint32_t>(InputElements.size());
- BaseData.SigOutputElements = static_cast<uint32_t>(OutputElements.size());
- BaseData.SigPatchOrPrimElements =
- static_cast<uint32_t>(PatchOrPrimElements.size());
-
- SmallVector<StringRef, 32> SemanticNames;
-
- // Build a string table and set associated offsets to be written when
- // write() is called
- ProcessElementList(DXConStrTabBuilder, IndexBuffer, SignatureElements,
- SemanticNames, InputElements);
- ProcessElementList(DXConStrTabBuilder, IndexBuffer, SignatureElements,
- SemanticNames, OutputElements);
- ProcessElementList(DXConStrTabBuilder, IndexBuffer, SignatureElements,
- SemanticNames, PatchOrPrimElements);
-
- DXConStrTabBuilder.add(EntryName);
-
- DXConStrTabBuilder.finalize();
- for (auto ElAndName : zip(SignatureElements, SemanticNames)) {
- llvm::dxbc::PSV::v0::SignatureElement &El = std::get<0>(ElAndName);
- StringRef Name = std::get<1>(ElAndName);
- El.NameOffset = static_cast<uint32_t>(DXConStrTabBuilder.getOffset(Name));
- if (sys::IsBigEndianHost)
- El.swapBytes();
- }
-
- BaseData.EntryNameOffset =
- static_cast<uint32_t>(DXConStrTabBuilder.getOffset(EntryName));
-
- if (!sys::IsBigEndianHost)
- return;
- BaseData.swapBytes();
- BaseData.swapBytes(Stage);
- for (auto &Res : Resources)
- Res.swapBytes();
-}
-
void Signature::write(raw_ostream &OS) {
SmallVector<dxbc::ProgramSignatureElement> SigParams;
SigParams.reserve(Params.size());
diff --git a/llvm/lib/Object/DXContainer.cpp b/llvm/lib/Object/DXContainer.cpp
index 3b1a6203a1f8fc..935749afe33852 100644
--- a/llvm/lib/Object/DXContainer.cpp
+++ b/llvm/lib/Object/DXContainer.cpp
@@ -247,14 +247,7 @@ Error DirectX::PSVRuntimeInfo::parse(uint16_t ShaderKind) {
const uint32_t PSVVersion = getVersion();
// Detect the PSVVersion by looking at the size field.
- if (PSVVersion == 3) {
- v3::RuntimeInfo Info;
- if (Error Err = readStruct(PSVInfoData, Current, Info))
- return Err;
- if (sys::IsBigEndianHost)
- Info.swapBytes(ShaderStage);
- BasicInfo = Info;
- } else if (PSVVersion == 2) {
+ if (PSVVersion == 2) {
v2::RuntimeInfo Info;
if (Error Err = readStruct(PSVInfoData, Current, Info))
return Err;
@@ -432,8 +425,6 @@ Error DirectX::PSVRuntimeInfo::parse(uint16_t ShaderKind) {
}
uint8_t DirectX::PSVRuntimeInfo::getSigInputCount() const {
- if (const auto *P = std::get_if<dxbc::PSV::v3::RuntimeInfo>(&BasicInfo))
- return P->SigInputElements;
if (const auto *P = std::get_if<dxbc::PSV::v2::RuntimeInfo>(&BasicInfo))
return P->SigInputElements;
if (const auto *P = std::get_if<dxbc::PSV::v1::RuntimeInfo>(&BasicInfo))
@@ -442,8 +433,6 @@ uint8_t DirectX::PSVRuntimeInfo::getSigInputCount() const {
}
uint8_t DirectX::PSVRuntimeInfo::getSigOutputCount() const {
- if (const auto *P = std::get_if<dxbc::PSV::v3::RuntimeInfo>(&BasicInfo))
- return P->SigOutputElements;
if (const auto *P = std::get_if<dxbc::PSV::v2::RuntimeInfo>(&BasicInfo))
return P->SigOutputElements;
if (const auto *P = std::get_if<dxbc::PSV::v1::RuntimeInfo>(&BasicInfo))
@@ -452,8 +441,6 @@ uint8_t DirectX::PSVRuntimeInfo::getSigOutputCount() const {
}
uint8_t DirectX::PSVRuntimeInfo::getSigPatchOrPrimCount() const {
- if (const auto *P = std::get_if<dxbc::PSV::v3::RuntimeInfo>(&BasicInfo))
- return P->SigPatchOrPrimElements;
if (const auto *P = std::get_if<dxbc::PSV::v2::RuntimeInfo>(&BasicInfo))
return P->SigPatchOrPrimElements;
if (const auto *P = std::get_if<dxbc::PSV::v1::RuntimeInfo>(&BasicInfo))
diff --git a/llvm/lib/ObjectYAML/DXContainerEmitter.cpp b/llvm/lib/ObjectYAML/DXContainerEmitter.cpp
index f3a518df317504..09a5e41c71234f 100644
--- a/llvm/lib/ObjectYAML/DXContainerEmitter.cpp
+++ b/llvm/lib/ObjectYAML/DXContainerEmitter.cpp
@@ -198,9 +198,8 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
if (!P.Info.has_value())
continue;
mcdxbc::PSVRuntimeInfo PSV;
- memcpy(&PSV.BaseData, &P.Info->Info, sizeof(dxbc::PSV::v3::RuntimeInfo));
+ memcpy(&PSV.BaseData, &P.Info->Info, sizeof(dxbc::PSV::v2::RuntimeInfo));
PSV.Resources = P.Info->Resources;
- PSV.EntryName = P.Info->EntryName;
for (auto El : P.Info->SigInputElements)
PSV.InputElements.push_back(mcdxbc::PSVSignatureElement{
diff --git a/llvm/lib/ObjectYAML/DXContainerYAML.cpp b/llvm/lib/ObjectYAML/DXContainerYAML.cpp
index 38063670aee6e8..a6871e7855e4e7 100644
--- a/llvm/lib/ObjectYAML/DXContainerYAML.cpp
+++ b/llvm/lib/ObjectYAML/DXContainerYAML.cpp
@@ -74,16 +74,6 @@ DXContainerYAML::PSVInfo::PSVInfo(const dxbc::PSV::v2::RuntimeInfo *P)
memcpy(&Info, P, sizeof(dxbc::PSV::v2::RuntimeInfo));
}
-DXContainerYAML::PSVInfo::PSVInfo(const dxbc::PSV::v3::RuntimeInfo *P,
- StringRef StringTable)
- : Version(3),
- EntryName(StringTable.substr(P->EntryNameOffset,
- StringTable.find('\0', P->EntryNameOffset) -
- P->EntryNameOffset)) {
- memset(&Info, 0, sizeof(Info));
- memcpy(&Info, P, sizeof(dxbc::PSV::v3::RuntimeInfo));
-}
-
namespace yaml {
void MappingTraits<DXContainerYAML::VersionTuple>::mapping(
@@ -358,11 +348,6 @@ void DXContainerYAML::PSVInfo::mapInfoForVersion(yaml::IO &IO) {
IO.mapRequired("NumThreadsX", Info.NumThreadsX);
IO.mapRequired("NumThreadsY", Info.NumThreadsY);
IO.mapRequired("NumThreadsZ", Info.NumThreadsZ);
-
- if (Version == 2)
- return;
-
- IO.mapRequired("EntryName", EntryName);
}
} // namespace llvm
diff --git a/llvm/test/ObjectYAML/DXContainer/PSVv3-amplification.yaml b/llvm/test/ObjectYAML/DXContainer/PSVv3-amplification.yaml
deleted file mode 100644
index 09885bd529f05f..00000000000000
--- a/llvm/test/ObjectYAML/DXContainer/PSVv3-amplification.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-# RUN: yaml2obj %s | obj2yaml | FileCheck %s
-
---- !dxcontainer
-Header:
- Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
- Version:
- Major: 1
- Minor: 0
- PartCount: 2
-Parts:
- - Name: PSV0
- Size: 144
- PSVInfo:
- Version: 3
- ShaderStage: 14
- PayloadSizeInBytes: 4092
- MinimumWaveLaneCount: 0
- MaximumWaveLaneCount: 4294967295
- UsesViewID: 0
- SigInputVectors: 0
- SigOutputVectors: [ 8, 16, 32, 64 ]
- NumThreadsX: 512
- NumThreadsY: 1024
- NumThreadsZ: 2048
- EntryName: ASEntry
- ResourceStride: 24
- Resources:
- - Type: 1
- Space: 2
- LowerBound: 3
- UpperBound: 4
- Kind: 5
- Flags: 6
- - Type: 128
- Space: 32768
- LowerBound: 8388608
- UpperBound: 2147483648
- Kind: 65535
- Flags: 16776960
- SigInputElements: []
- SigOutputElements: []
- SigPatchOrPrimElements: []
- InputOutputMap:
- - [ ]
- - [ ]
- - [ ]
- - [ ]
- - Name: DXIL
- Size: 24
- Program:
- MajorVersion: 6
- MinorVersion: 0
- ShaderKind: 14
- Size: 6
- DXILMajorVersion: 0
- DXILMinorVersion: 1
- DXILSize: 0
-...
-
-# CHECK: Name: PSV0
-# CHECK: PSVInfo:
-# CHECK-NEXT: Version: 3
-# CHECK-NEXT: ShaderStage: 14
-# CHECK-NEXT: PayloadSizeInBytes: 4092
-# CHECK-NEXT: MinimumWaveLaneCount: 0
-# CHECK-NEXT: MaximumWaveLaneCount: 4294967295
-# CHECK-NEXT: UsesViewID: 0
-# CHECK-NEXT: SigInputVectors: 0
-# CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
-# CHECK-NEXT: NumThreadsX: 512
-# CHECK-NEXT: NumThreadsY: 1024
-# CHECK-NEXT: NumThreadsZ: 2048
-# CHECK-NEXT: EntryName: ASEntry
-# CHECK-NEXT: ResourceStride: 24
-# CHECK-NEXT: Resources:
-# CHECK-NEXT: - Type: 1
-# CHECK-NEXT: Space: 2
-# CHECK-NEXT: LowerBound: 3
-# CHECK-NEXT: UpperBound: 4
-# CHECK-NEXT: Kind: 5
-# CHECK-NEXT: Flags: 6
-# CHECK-NEXT: - Type: 128
-# CHECK-NEXT: Space: 32768
-# CHECK-NEXT: LowerBound: 8388608
-# CHECK-NEXT: UpperBound: 2147483648
-# CHECK-NEXT: Kind: 65535
-# CHECK-NEXT: Flags: 16776960
-# CHECK-NEXT: SigInputElements: []
-# CHECK-NEXT: SigOutputElements: []
-# CHECK-NEXT: SigPatchOrPrimElements: []
-# CHECK-NEXT: InputOutputMap:
-# CHECK-NEXT: - [ ]
-# CHECK-NEXT: - [ ]
-# CHECK-NEXT: - [ ]
-# CHECK-NEXT: - [ ]
-# CHECK-NEXT: Name
diff --git a/llvm/test/ObjectYAML/DXContainer/PSVv3-compute.yaml b/llvm/test/ObjectYAML/DXContainer/PSVv3-compute.yaml
deleted file mode 100644
index ee6fb112c77222..00000000000000
--- a/llvm/test/ObjectYAML/DXContainer/PSVv3-compute.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-# RUN: yaml2obj %s | obj2yaml | FileCheck %s
-
---- !dxcontainer
-Header:
- Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
- Version:
- Major: 1
- Minor: 0
- PartCount: 2
-Parts:
- - Name: PSV0
- Size: 144
- PSVInfo:
- Version: 3
- ShaderStage: 5
- MinimumWaveLaneCount: 0
- MaximumWaveLaneCount: 4294967295
- UsesViewID: 0
- SigInputVectors: 0
- SigOutputVectors: [ 8, 16, 32, 64 ]
- NumThreadsX: 512
- NumThreadsY: 1024
- NumThreadsZ: 2048
- EntryName: CSEntry
- ResourceStride: 24
- Resources:
- - Type: 1
- Space: 2
- LowerBound: 3
- UpperBound: 4
- Kind: 5
- Flags: 6
- - Type: 128
- Space: 32768
- LowerBound: 8388608
- UpperBound: 2147483648
- Kind: 65535
- Flags: 16776960
- SigInputElements: []
- SigOutputElements: []
- SigPatchOrPrimElements: []
- InputOutputMap:
- - [ ]
- - [ ]
- - [ ]
- - [ ]
- - Name: DXIL
- Size: 24
- Program:
- MajorVersion: 6
- MinorVersion: 0
- ShaderKind: 5
- Size: 6
- DXILMajorVersion: 0
- DXILMinorVersion: 1
- DXILSize: 0
-...
-
-# CHECK: Name: PSV0
-# CHECK: PSVInfo:
-# CHECK-NEXT: Version: 3
-# CHECK-NEXT: ShaderStage: 5
-# CHECK-NEXT: MinimumWaveLaneCount: 0
-# CHECK-NEXT: MaximumWaveLaneCount: 4294967295
-# CHECK-NEXT: UsesViewID: ...
[truncated]
|
|
It's good to add a reason for the revert in the commit message. |
You can test this locally with the following command:git-clang-format --diff 8d1affb87181b9636b87e04a245bcde06f8a7d47 3c835c155fd925c0aca8a980a184d00f884aa41e -- llvm/include/llvm/BinaryFormat/DXContainer.h llvm/include/llvm/MC/DXContainerPSVInfo.h llvm/include/llvm/MC/StringTableBuilder.h llvm/include/llvm/Object/DXContainer.h llvm/include/llvm/ObjectYAML/DXContainerYAML.h llvm/lib/MC/DXContainerPSVInfo.cpp llvm/lib/Object/DXContainer.cpp llvm/lib/ObjectYAML/DXContainerEmitter.cpp llvm/lib/ObjectYAML/DXContainerYAML.cpp llvm/tools/obj2yaml/dxcontainer2yaml.cppView the diff from clang-format here.diff --git a/llvm/include/llvm/MC/StringTableBuilder.h b/llvm/include/llvm/MC/StringTableBuilder.h
index 4ee421e22c..a738683548 100644
--- a/llvm/include/llvm/MC/StringTableBuilder.h
+++ b/llvm/include/llvm/MC/StringTableBuilder.h
@@ -74,12 +74,8 @@ public:
/// Check if a string is contained in the string table. Since this class
/// doesn't store the string values, this function can be used to check if
/// storage needs to be done prior to adding the string.
- bool contains(StringRef S) const {
- return contains(CachedHashStringRef(S));
- }
- bool contains(CachedHashStringRef S) const {
- return StringIndexMap.count(S);
- }
+ bool contains(StringRef S) const { return contains(CachedHashStringRef(S)); }
+ bool contains(CachedHashStringRef S) const { return StringIndexMap.count(S); }
size_t getSize() const { return Size; }
void clear();
|
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
This reverts commit cde54df. Co-authored-by: Cooper Partin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit cde54df.