From 79dd12c21e8f5c5ce01051a280679cf6ac8ffe97 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 26 Apr 2022 12:09:32 -0400
Subject: Linking in DXC (#2190)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Compile to a dxil library.

* Added CompileProduct.

* Support handling of ModuleLibrary.

* CacheBehavior -> Cache

* Use CompileProduct for -r references.

* CompileProduct -> Artifact.

* Determining an artifact type on binding.

* Determine binary linkability.

* Added Artifact::exists.

* Added ArtifactKeep.

* Small fixes.

* Small improvements to Artifact.

* Add zip extension.

* Fix some comments.

* Fix multiple adding of PublicDecoration.
Make public output export for DXIL/lib.
Add checking for simpleDecorations such that only added once.

* Use 'whole program' to identify library build.

* Move slang-artifact into compiler-core.

* Split out Keep free functions.

* Artifact::Keep -> ArtifactKeep.

* Handle libraries as artifacts.

* Add -target dxil so test infrastructure knows it needs DXC.

* Linking working in DXC.

* Improve handling around emit for 'export'.

* Add comment around Artifact name.

* Render test working with linking.

Co-authored-by: Theresa Foley <10618364+tangent-vector@users.noreply.github.com>
---
 source/compiler-core/slang-gcc-compiler-util.cpp | 51 ++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'source/compiler-core/slang-gcc-compiler-util.cpp')

diff --git a/source/compiler-core/slang-gcc-compiler-util.cpp b/source/compiler-core/slang-gcc-compiler-util.cpp
index 8d1b87b68..7d1b7b86a 100644
--- a/source/compiler-core/slang-gcc-compiler-util.cpp
+++ b/source/compiler-core/slang-gcc-compiler-util.cpp
@@ -619,6 +619,56 @@ static SlangResult _parseGCCFamilyLine(const UnownedStringSlice& line, LineParse
         cmdLine.addArg(sourceFile);
     }
 
+    // Add the library paths
+    List<String> libraryPaths;
+    libraryPaths.addRange(options.libraryPaths.getBuffer(), options.libraryPaths.getCount());
+
+    // Artifacts might add library paths
+    for (Artifact* artifact : options.libraries)
+    {
+        const auto desc = artifact->getDesc();
+        // If it's a library for CPU types, try and use it
+        if (desc.isCpuBinary())
+        {           
+            if (desc.kind == ArtifactKind::Library)
+            {
+                String path;
+                SLANG_RETURN_ON_FAIL(artifact->requireFilePath(ArtifactKeep::No, path));
+
+                String parentDir = Path::getParentDirectory(parentDir);
+                if (parentDir.getLength())
+                {
+                    // Check if we already have the library path, only add it if it's not found
+                    if (libraryPaths.indexOf(parentDir) < 0)
+                    {
+                        libraryPaths.add(parentDir);
+                    }
+                    path = Path::getFileName(path);
+                }
+
+                // If it starts with lib strip it
+                if (path.startsWith("lib"))
+                {
+                    const String stripLib = path.getUnownedSlice().tail(3);
+                    path = stripLib;
+                }
+
+                // Strip the extension if it's a match
+                auto extension = Path::getPathExt(path);
+                if (extension.getLength())
+                {
+                    auto libExt = ArtifactDesc::make(ArtifactKind::Library, ArtifactPayload::HostCPU).getDefaultExtension();
+                    if (extension == libExt)
+                    {
+                        path = Path::getFileNameWithoutExt(path);
+                    }
+                }
+
+                cmdLine.addPrefixPathArg("-l", path);
+            }
+        }
+    }
+
     for (const auto& libPath : options.libraryPaths)
     {
         // Note that any escaping of the path is handled in the ProcessUtil::
@@ -628,6 +678,7 @@ static SlangResult _parseGCCFamilyLine(const UnownedStringSlice& line, LineParse
         cmdLine.addArg(libPath);
     }
 
+
     if (options.sourceLanguage == SLANG_SOURCE_LANGUAGE_CPP && !PlatformUtil::isFamily(PlatformFamily::Windows, platformKind))
     {
         // Make STD libs available
-- 
cgit v1.2.3