summaryrefslogtreecommitdiffstats
path: root/source/compiler-core/slang-artifact-representation-impl.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2022-08-16 16:12:45 -0400
committerGitHub <noreply@github.com>2022-08-16 13:12:45 -0700
commit42de00db3ffe07599fff6d47d0d7228181ee3082 (patch)
tree84367b359cd2701212214379d4d604488c4fac91 /source/compiler-core/slang-artifact-representation-impl.cpp
parentac71724c03392b429e44641a3641b2bcf7cc55fc (diff)
Move metadata/diagnostics to associated types (#2358)
* #include an absolute path didn't work - because paths were taken to always be relative. * WIP with hierarchical enums. * Some small fixes and improvements around artifact desc related types. * Improvements around hierarchical enum. * Fixes to get Artifact types refactor to be able to execute tests. * Attempt to better categorize PTX. * Work around for potentially unused function warning. * Typo fix. * Simplify Artifact header. * Small improvements around Artifact kind/payload/style. * Added IDestroyable/ICastable * Add IArtifactList. * First impl of IArtifactUtil. * Use the ICastable interface for IArtifactRepresentation. * Added IArtifactRepresentation & IArtifactAssociated. * Add SLANG_OVERRIDE to avoid gcc/clang warning. * Fix calling convention issue on win32. * Fix missing SLANG_OVERRIDE. * First attempt at file abstraction around Artifact. * Added creation of lock file. * Move functionality for determining file paths to the IArtifactUtil. Add casting to ICastable. * Added some casting/finding mechanisms. * Simplify IArtifact interface, and use Items for file reps. * Fix problem with libraries on DXIL. * Split out ArtifactRepresentation. * Move ArtifactDesc functionality to ArtifactDescUtil. ArtifactInfoUtil becomes ArtifactDescUtil. * Split implementations from the interfaces for Artifact. * Use TypeTextUtil for target name outputting. * Add artifact impls. * Add ICastableList * Added UnknownCastableAdapter * Make ISlangSharedLibrary derive from ICastable, and remain backwards compatible with slang-llvm. * Refactor Representation on Artifact. * Make our ISlangBlobs also derive from ICastable. Make ISlangBlob atomic ref counted. * Split out CastableList and related types, and placed in core. * Small fixes around IArtifact. Improve IArtifact docs. First impl of getChildren for IArtifact. * Documentation improvements for Artifact related types. * Fix typo. * Special case adding a ICastableList to a LazyCastableList. * Small simplification of LazyCastableList, by adding State member. * Removed the ILockFile interface because IFileArtifactRepresentation can be used. * Implement DiagnosticsArtifactRepresentation. * Added PostEmitMetadataArtifactRepresentation * Add searching by predicate. Added handling of accessing Artifact as ISharedLibrary * Fix typo. * Add find to IArtifacgtList. Fix some missing SLANG_NO_THROW. * Small improvements around ArtifactDesc types. * Another small change around ArtifactKind. * Some more shuffling of ArtifactDesc. * Make IArtifact castable Remove IArtifactList Made IArtifactContainer derive from IArtifact Made ModuleLibrary atomic ref counted/given IModuleLibrary interface. * Must call _requireChildren before any children access. * Fix missing SLANG_MCALL on castAs. * Fix missing SLANG_OVERRIDE. * Added IArtifactHandler * Use ICastable for basis of scope/lookup. * WIP first attempt to remove CompileResult. * Fix support for for downstream compiler shared library adapter. * Fix issues found when replacing CompileResult. * Fix typo. * Fix getting items form 'significant' member of an Artifact. * Split out ArtifactUtil & ArtifactHandler. * Work around for problem on Visual studio. * Improve searching. * Add missing files. * Split out Artifact associated types. Don't produce a container by default - use associated for 'metadata'. * Remove no longer used ArtifactPayload type. * Generalized converting representations. Small improvements to artifacts. * Fix intermediate dumping issue. * Removed #if 0 out CompileResult. Remove DownstreamCompileResult maybeDumpIntermediate. * Pull out functionality for dumping artifact output into ArtifactOutputUtil Fixed a bug in naming files based on ArtifactDesc. * std::atomic issue. * Fix outputting as text bug. Some small improvements. * Add fix around prefix for dumping. Improved how handling for extensions work form ArtifactDesc. * Dump assembly if available.
Diffstat (limited to 'source/compiler-core/slang-artifact-representation-impl.cpp')
-rw-r--r--source/compiler-core/slang-artifact-representation-impl.cpp116
1 files changed, 13 insertions, 103 deletions
diff --git a/source/compiler-core/slang-artifact-representation-impl.cpp b/source/compiler-core/slang-artifact-representation-impl.cpp
index 32ec055d8..802f2c1dd 100644
--- a/source/compiler-core/slang-artifact-representation-impl.cpp
+++ b/source/compiler-core/slang-artifact-representation-impl.cpp
@@ -9,6 +9,8 @@
#include "slang-artifact-util.h"
+#include "../core/slang-castable-list-impl.h"
+
namespace Slang {
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! FileArtifactRepresentation !!!!!!!!!!!!!!!!!!!!!!!!!!! */
@@ -45,16 +47,23 @@ void* FileArtifactRepresentation::castAs(const Guid& guid)
return getObject(guid);
}
-SlangResult FileArtifactRepresentation::writeToBlob(ISlangBlob** blob)
+SlangResult FileArtifactRepresentation::createRepresentation(const Guid& typeGuid, ICastable** outCastable)
{
- if (m_kind == Kind::NameOnly)
+ // We can convert into a blob only, and only if we have a path
+ // If it's referenced by a name only, it's a file that *can't* be loaded as a blob in general.
+ if (typeGuid != ISlangBlob::getTypeGuid() ||
+ m_kind == Kind::NameOnly)
{
- // If it's referenced by a name only, it's a file that *can't* be loaded as a blob in general.
return SLANG_E_NOT_AVAILABLE;
}
+ ComPtr<ISlangBlob> blob;
+
auto fileSystem = _getFileSystem();
- return fileSystem->loadFile(m_path.getBuffer(), blob);
+ SLANG_RETURN_ON_FAIL(fileSystem->loadFile(m_path.getBuffer(), blob.writeRef()));
+
+ *outCastable = CastableUtil::getCastable(blob).detach();
+ return SLANG_OK;
}
bool FileArtifactRepresentation::exists()
@@ -94,105 +103,6 @@ FileArtifactRepresentation::~FileArtifactRepresentation()
}
}
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DiagnosticsArtifactRepresentation !!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-void* DiagnosticsArtifactRepresentation::getInterface(const Guid& guid)
-{
- if (guid == ISlangUnknown::getTypeGuid() ||
- guid == ICastable::getTypeGuid() ||
- guid == IArtifactRepresentation::getTypeGuid() ||
- guid == IDiagnosticsArtifactRepresentation::getTypeGuid())
- {
- return static_cast<DiagnosticsArtifactRepresentation*>(this);
- }
- return nullptr;
-}
-
-void* DiagnosticsArtifactRepresentation::getObject(const Guid& guid)
-{
- SLANG_UNUSED(guid);
- return nullptr;
-}
-
-void* DiagnosticsArtifactRepresentation::castAs(const Guid& guid)
-{
- if (auto intf = getInterface(guid))
- {
- return intf;
- }
- return getObject(guid);
-}
-
-SlangResult DiagnosticsArtifactRepresentation::writeToBlob(ISlangBlob** outBlob)
-{
- *outBlob = nullptr;
- return SLANG_E_NOT_IMPLEMENTED;
-}
-
-bool DiagnosticsArtifactRepresentation::exists()
-{
- return true;
-}
-
-ZeroTerminatedCharSlice DiagnosticsArtifactRepresentation::_allocateSlice(const Slice<char>& in)
-{
- if (in.count == 0)
- {
- return ZeroTerminatedCharSlice("", 0);
- }
- const char* dst = m_arena.allocateString(in.data, in.count);
- return ZeroTerminatedCharSlice(dst, in.count);
-}
-
-void DiagnosticsArtifactRepresentation::add(const Diagnostic& inDiagnostic)
-{
- Diagnostic diagnostic(inDiagnostic);
-
- diagnostic.text = _allocateSlice(inDiagnostic.text);
- diagnostic.code = _allocateSlice(inDiagnostic.code);
- diagnostic.filePath = _allocateSlice(inDiagnostic.filePath);
-
- m_diagnostics.add(diagnostic);
-}
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PostEmitMetadataArtifactRepresentation !!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-void* PostEmitMetadataArtifactRepresentation::getInterface(const Guid& guid)
-{
- if (guid == ISlangUnknown::getTypeGuid() ||
- guid == ICastable::getTypeGuid() ||
- guid == IArtifactRepresentation::getTypeGuid() ||
- guid == IPostEmitMetadataArtifactRepresentation::getTypeGuid())
- {
- return static_cast<IPostEmitMetadataArtifactRepresentation*>(this);
- }
- return nullptr;
-}
-
-void* PostEmitMetadataArtifactRepresentation::getObject(const Guid& uuid)
-{
- if (uuid == getTypeGuid())
- {
- return this;
- }
- return nullptr;
-}
-
-void* PostEmitMetadataArtifactRepresentation::castAs(const Guid& guid)
-{
- if (auto ptr = getInterface(guid))
- {
- return ptr;
- }
- return getObject(guid);
-}
-
-
-Slice<ShaderBindingRange> PostEmitMetadataArtifactRepresentation::getBindingRanges()
-{
- return Slice<ShaderBindingRange>(m_metadata.usedBindings.getBuffer(), m_metadata.usedBindings.getCount());
-}
-
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PostEmitMetadataArtifactRepresentation !!!!!!!!!!!!!!!!!!!!!!!!!!! */
void* ObjectArtifactRepresentation::castAs(const Guid& guid)