Remove CompileResult to use IArtifact (#2357)

* #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.

1 files changed, 42 insertions, 15 deletions

diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp
index f3e78e48f..43f9da3df 100644
--- a/source/slang/slang-emit.cpp
+++ b/source/slang/slang-emit.cpp
@@ -69,6 +69,8 @@
 #include "slang-emit-cuda.h"
 
 #include "../compiler-core/slang-artifact-desc-util.h"
+#include "../compiler-core/slang-artifact-util.h"
+#include "../compiler-core/slang-artifact-impl.h"
 
 #include <assert.h>
 
@@ -834,17 +836,20 @@ Result linkAndOptimizeIR(
 #endif
     validateIRModuleIfEnabled(codeGenContext, irModule);
 
-    outLinkedIR.metadata = new PostEmitMetadata();
-    collectMetadata(irModule, *outLinkedIR.metadata);
+    auto metadata = Artifact::create(ArtifactDesc::make(ArtifactKind::Instance, ArtifactPayload::PostEmitMetadata, artifactDesc.style));
+    auto postEmitMetaRep = new PostEmitMetadataArtifactRepresentation;
+    metadata->addRepresentation(postEmitMetaRep);
+
+    collectMetadata(irModule, postEmitMetaRep->m_metadata);
+
+    outLinkedIR.metadata = metadata;
 
     return SLANG_OK;
 }
 
-SlangResult CodeGenContext::emitEntryPointsSourceFromIR(
-    String&                 outSource,
-    RefPtr<PostEmitMetadata>& outMetadata)
+SlangResult CodeGenContext::emitEntryPointsSourceFromIR(ComPtr<IArtifact>& outArtifact)
 {
-    outSource = String();
+    outArtifact.setNull();
 
     auto session = getSession();
     auto sink = getSink();
@@ -852,6 +857,8 @@ SlangResult CodeGenContext::emitEntryPointsSourceFromIR(
     auto target = getTargetFormat();
     auto targetRequest = getTargetReq();
 
+    auto artifactContainer = ArtifactUtil::createResultsContainer();
+
     auto lineDirectiveMode = targetRequest->getLineDirectiveMode();
     // To try to make the default behavior reasonable, we will
     // always use C-style line directives (to give the user
@@ -923,6 +930,7 @@ SlangResult CodeGenContext::emitEntryPointsSourceFromIR(
 
     SLANG_RETURN_ON_FAIL(sourceEmitter->init());
 
+
     {
         LinkingAndOptimizationOptions linkingAndOptimizationOptions;
 
@@ -947,8 +955,11 @@ SlangResult CodeGenContext::emitEntryPointsSourceFromIR(
 
         auto irModule = linkedIR.module;
 
-        outMetadata = linkedIR.metadata;
-
+        if (linkedIR.metadata)
+        {
+            artifactContainer->addChild(linkedIR.metadata);
+        }
+        
         // After all of the required optimization and legalization
         // passes have been performed, we can emit target code from
         // the IR module.
@@ -1017,7 +1028,13 @@ SlangResult CodeGenContext::emitEntryPointsSourceFromIR(
     finalResult.append(code);
 
     // Write out the result
-    outSource = finalResult;
+
+    auto targetArtifact = ArtifactUtil::createArtifactForCompileTarget(asExternal(target));
+    targetArtifact->addRepresentationUnknown(StringBlob::moveCreate(finalResult));
+
+    artifactContainer->addChild(targetArtifact);
+
+    outArtifact = artifactContainer;
     return SLANG_OK;
 }
 
@@ -1029,9 +1046,10 @@ SlangResult emitSPIRVFromIR(
 
 SlangResult emitSPIRVForEntryPointsDirectly(
     CodeGenContext* codeGenContext,
-    List<uint8_t>&  spirvOut,
-    RefPtr<PostEmitMetadata>& outMetadata)
+    ComPtr<IArtifact>& outArtifact)
 {
+    auto artifactContainer = ArtifactUtil::createResultsContainer();
+
     // Outside because we want to keep IR in scope whilst we are processing emits
     LinkedIR linkedIR;
     LinkingAndOptimizationOptions linkingAndOptimizationOptions;
@@ -1043,13 +1061,22 @@ SlangResult emitSPIRVForEntryPointsDirectly(
     auto irModule = linkedIR.module;
     auto irEntryPoints = linkedIR.entryPoints;
 
-    emitSPIRVFromIR(codeGenContext, irModule, irEntryPoints, spirvOut);
+    List<uint8_t> spirv;
+    emitSPIRVFromIR(codeGenContext, irModule, irEntryPoints, spirv);
 
-    outMetadata = linkedIR.metadata;
+    auto targetArtifact = ArtifactUtil::createArtifactForCompileTarget(asExternal(codeGenContext->getTargetFormat()));
+    targetArtifact->addRepresentationUnknown(ListBlob::moveCreate(spirv));
 
-    return SLANG_OK;
-}
+    artifactContainer->addChild(targetArtifact);
 
+    if (linkedIR.metadata)
+    {
+        artifactContainer->addChild(linkedIR.metadata);
+    }
+
+    outArtifact = artifactContainer;
 
+    return SLANG_OK;
+}
 
 } // namespace Slang