Feature(cli): Introduce --debug option

ovr · Jul 1, 2019 · 6a739f5 · 6a739f5
1 parent bab4576
commit 6a739f5
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 32 deletions.
diff --git a/src/cli.ts b/src/cli.ts
@@ -14,14 +14,16 @@ import {executeLLCSync, executeOptSync} from "./utils";
 
 interface CommandLineArguments {
     args: string[];
-    printIR?: boolean;
-    outputFile?: string;
-    optimizationLevel?: string;
+    debug: boolean;
+    printIR: boolean;
+    outputFile: string;
+    optimizationLevel: string;
 }
 
 function parseCommandLine(): CommandLineArguments {
     cli
         .version('next')
+        .option('--debug', 'Show all debug information', false)
         .option('-ir, --printIR', 'Print IR', false)
         .option('-f, --outputFile <n>', 'Name of the executable file', 'main')
         .option('-o, --optimizationLevel <n>', 'Optimization level', 3)
@@ -74,31 +76,61 @@ try {
 
     const optimizationLevel = `-O${cliOptions.optimizationLevel}`;
 
-    executeOptSync([
-        optimizationLevel,
-        path.join(outputPath, 'main.bc'),
-        '-o', path.join(outputPath, 'main.bc')
-    ]);
-
-    executeLLCSync([
-        optimizationLevel,
-        // Fully relocatable, position independent code
-        '-relocation-model=pic',
-        '-filetype=obj', path.join(outputPath, 'main.bc'),
-        '-o', path.join(outputPath, 'main.o'),
-    ]);
-
-    execFileSync("c++", [
-        optimizationLevel,
-        path.join(outputPath, 'main.o'),
-        RUNTIME_ARCHIVE_FILE,
-        '-o', path.join(outputPath, cliOptions.outputFile),
-        '-lstdc++',
-        '-std=c++11',
-        '-Werror',
-        '-pthread',
-        '-v',
-    ]);
+    if (cliOptions.debug) {
+        ts.sys.write('Executing llvm-opt');
+    }
+
+    {
+        const output = executeOptSync([
+            optimizationLevel,
+            path.join(outputPath, 'main.bc'),
+            '-o', path.join(outputPath, 'main.bc')
+        ]);
+
+        if (cliOptions.debug) {
+            ts.sys.write(output.toString());
+        }
+    }
+
+    if (cliOptions.debug) {
+        ts.sys.write('Executing llvm-llc');
+    }
+
+    {
+        const output = executeLLCSync([
+            optimizationLevel,
+            // Fully relocatable, position independent code
+            '-relocation-model=pic',
+            '-filetype=obj', path.join(outputPath, 'main.bc'),
+            '-o', path.join(outputPath, 'main.o'),
+        ]);
+
+        if (cliOptions.debug) {
+            ts.sys.write(output.toString());
+        }
+    }
+
+    if (cliOptions.debug) {
+        ts.sys.write('Executing c++ compiler');
+    }
+
+    {
+        const output = execFileSync("c++", [
+            optimizationLevel,
+            path.join(outputPath, 'main.o'),
+            RUNTIME_ARCHIVE_FILE,
+            '-o', path.join(outputPath, cliOptions.outputFile),
+            '-lstdc++',
+            '-std=c++11',
+            '-Werror',
+            '-pthread',
+            '-v',
+        ]);
+
+        if (cliOptions.debug) {
+            ts.sys.write(output.toString());
+        }
+    }
 } catch (e) {
     if (e instanceof UnsupportedError) {
         ts.sys.write(ts.formatDiagnosticsWithColorAndContext([e.toDiagnostic()], DiagnosticHostInstance));

diff --git a/src/utils.ts b/src/utils.ts
@@ -12,15 +12,15 @@ function getLLVMBinDirectory(): string {
     return llvmBinDir;
 }
 
-export function executeLLCSync(options: Array<any>) {
-    child_process.execFileSync(
+export function executeLLCSync(options: Array<any>): Buffer|string {
+    return child_process.execFileSync(
         path.join(getLLVMBinDirectory(), 'llc'),
         options
     )
 }
 
-export function executeOptSync(options: Array<any>) {
-    child_process.execFileSync(
+export function executeOptSync(options: Array<any>): Buffer|string {
+    return child_process.execFileSync(
         path.join(getLLVMBinDirectory(), 'opt'),
         options
     )

diff --git a/tests/runner.ts b/tests/runner.ts
@@ -22,6 +22,7 @@ async function main() {
 
             const compileLog = execFileSync(path.join(__dirname, '..', 'bin', 'ssc'), [
                 '--printIR',
+                '--debug',
                 testFile
             ]);