Small improvements around C/C++ testing (#1017)

* * Simplify some of test code around CPPCompiler
* Test using 'callable' with pass-through
* Small cpu doc improvements

* Improvements to Clang output parsing.

* Remove temporary file (base filename) .

* Improve handling of external errors - handle severity.

* On error dumping out to 'actual' file for runCPPCompilerCompile.

* Small fixes.
Set the source language type correctly for pass thru.

* Remove warning for test for clang backend c

1 files changed, 36 insertions, 6 deletions

diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index 8ead63784..5b8643b02 100644
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -768,7 +768,7 @@ namespace Slang
         return result;
     }
 
-    void reportExternalCompileError(const char* compilerName, SlangResult res, const UnownedStringSlice& diagnostic, DiagnosticSink* sink)
+    void reportExternalCompileError(const char* compilerName, Severity severity, SlangResult res, const UnownedStringSlice& diagnostic, DiagnosticSink* sink)
     {
         StringBuilder builder;
         if (compilerName)
@@ -792,10 +792,15 @@ namespace Slang
             PlatformUtil::appendResult(res, builder);
         }
 
+        sink->diagnoseRaw(severity, builder.getUnownedSlice());
+    }
+
+    void reportExternalCompileError(const char* compilerName, SlangResult res, const UnownedStringSlice& diagnostic, DiagnosticSink* sink)
+    {
         // TODO(tfoley): need a better policy for how we translate diagnostics
         // back into the Slang world (although we should always try to generate
         // HLSL that doesn't produce any diagnostics...)
-        sink->diagnoseRaw(SLANG_FAILED(res) ? Severity::Error : Severity::Warning, builder.getUnownedSlice());
+        reportExternalCompileError(compilerName, SLANG_FAILED(res) ? Severity::Error : Severity::Warning, res, diagnostic, sink);
     }
 
     static String _getDisplayPath(DiagnosticSink* sink, SourceFile* sourceFile)
@@ -1341,10 +1346,16 @@ SlangResult dissassembleDXILUsingDXC(
 
         CPPCompiler::CompileOptions options;
 
+        // Set the source type
+        options.sourceType = (rawSourceLanguage == SourceLanguage::C) ? CPPCompiler::SourceType::C : CPPCompiler::SourceType::CPP;
+
         // Generate a path a temporary filename for output module
         String modulePath;
         SLANG_RETURN_ON_FAIL(File::generateTemporary(UnownedStringSlice::fromLiteral("slang-generated"), modulePath));
 
+        // Remove the temporary path/file when done
+        temporaryFileSet.add(modulePath);
+
         options.modulePath = modulePath;
         options.sourceFiles.add(compileSourcePath);
 
@@ -1483,17 +1494,36 @@ SlangResult dissassembleDXILUsingDXC(
                     builder << "link ";
                 }
 
+                // 
+                Severity severity = Severity::Error;
+                
                 switch (msg.type)
                 {
-                    case OutputMessage::Type::Error:    builder << "error"; break;
-                    case OutputMessage::Type::Unknown:  builder << "warning"; break;
-                    case OutputMessage::Type::Info:     builder << "info"; break;
+                    case OutputMessage::Type::Unknown:
+                    case OutputMessage::Type::Error:
+                    {
+                        severity = Severity::Error;
+                        builder << "error";
+                        break;
+                    }
+                    case OutputMessage::Type::Warning:
+                    {
+                        severity = Severity::Warning;
+                        builder << "warning";
+                        break;
+                    }
+                    case OutputMessage::Type::Info:
+                    {
+                        severity = Severity::Note;
+                        builder << "info";
+                        break;
+                    }
                     default: break;
                 }
 
                 builder << " " << msg.code << ": " << msg.text;
 
-                reportExternalCompileError(compilerText.getBuffer(), SLANG_OK, builder.getUnownedSlice(), sink);
+                reportExternalCompileError(compilerText.getBuffer(), severity, SLANG_OK, builder.getUnownedSlice(), sink);
             }
         }