Merge pull request compiler-explorer#1035 from mattgodbolt/hide-heade…

…r-code add option for hiding header code
tinyfpga · Dec 19, 2018 · b8983f9 · b8983f9
2 parents 240b29f + f7ff883
commit b8983f9
Show file tree

Hide file tree

Showing 11 changed files with 227 additions and 8 deletions.
diff --git a/etc/config/c++.defaults.properties b/etc/config/c++.defaults.properties
@@ -12,6 +12,7 @@ binaryHideFuncRe=^(__.*|_(init|start|fini)|(de)?register_tm_clones|call_gmon_sta
 needsMulti=false
 stubRe=\bmain\b
 stubText=int main(void){return 0;/*stub provided by Compiler Explorer*/}
+supportsLibraryCodeFilter=true
 
 #################################
 #################################

diff --git a/etc/config/compiler-explorer.defaults.properties b/etc/config/compiler-explorer.defaults.properties
@@ -28,3 +28,5 @@ textBanner=Compilation provided by Compiler Explorer at https://godbolt.org/
 # privacy policy, and then to enable both these below.
 cookiePolicyEnabled=false
 privacyPolicyEnabled=false
+
+supportsLibraryCodeFilter=false
diff --git a/lib/asm-parser-vc.js b/lib/asm-parser-vc.js
@@ -343,9 +343,11 @@ class AsmParser extends AsmParserBase {
         }
 
         for (const func of obj.functions) {
-            pushLine({text: "", source: null});
-            for (const line of func.lines) {
-                pushLine(line);
+            if (!filters.libraryCode || func.file === null) {
+                pushLine({text: "", source: null});
+                for (const line of func.lines) {
+                    pushLine(line);
+                }
             }
         }
 

diff --git a/lib/asm-parser.js b/lib/asm-parser.js
@@ -219,6 +219,10 @@ class AsmParser extends AsmRegex {
         const stdInLooking = /<stdin>|^-$|example\.[^/]+$|<source>/;
         const endBlock = /\.(cfi_endproc|data|text|section)/;
         let source = null;
+        let mayRemovePreviousLabel = true;
+
+        let inNvccDef = false;
+        let inNvccCode = false;
 
         let inCustomAssembly = 0;
         asmLines.forEach(line => {
@@ -260,11 +264,24 @@ class AsmParser extends AsmRegex {
                         break;
                 }
             }
-            if (line.match(endBlock)) {
+            if (line.match(endBlock) || (inNvccCode && line.match(/}/))) {
                 source = null;
                 prevLabel = null;
             }
 
+            if (filters.libraryCode && source && source.file !== null) {
+                if (mayRemovePreviousLabel && result.length > 0) {
+                    const lastLine = result[result.length - 1];
+                    if (lastLine.text && lastLine.text.match(this.labelDef)) {
+                        result.pop();
+                    }
+                    mayRemovePreviousLabel = false;
+                }
+                return;
+            } else {
+                mayRemovePreviousLabel = true;
+            }
+
             if (filters.commentOnly && line.match(commentOnly)) return;
 
             if (inCustomAssembly > 0)
@@ -274,8 +291,10 @@ class AsmParser extends AsmRegex {
             if (!match) match = line.match(this.assignmentDef);
             if (!match) {
                 match = line.match(this.cudaBeginDef);
-                if (match)
-                    this.inNvccDef = true;
+                if (match) {
+                    inNvccDef = true;
+                    inNvccCode = true;
+                }
             }
             if (match) {
                 // It's a label definition.
@@ -287,9 +306,9 @@ class AsmParser extends AsmRegex {
                     prevLabel = match;
                 }
             }
-            if (this.inNvccDef) {
+            if (inNvccDef) {
                 if (line.match(this.cudaEndDef))
-                    this.inNvccDef = false;
+                    inNvccDef = false;
             } else if (!match && filters.directives) {
                 // Check for directives only if it wasn't a label; the regexp would
                 // otherwise misinterpret labels as directives.
@@ -326,6 +345,7 @@ class AsmParser extends AsmRegex {
         let asmLines = asm.split("\n");
         let source = null;
         let func = null;
+        let mayRemovePreviousLabel = true;
 
         // Handle "error" documents.
         if (asmLines.length === 1 && asmLines[0][0] === '<') {
@@ -360,6 +380,19 @@ class AsmParser extends AsmRegex {
 
             if (!func || !this.isUserFunction(func)) return;
 
+            if (filters.libraryCode && source && source.file !== null) {
+                if (mayRemovePreviousLabel && result.length > 0) {
+                    const lastLine = result[result.length - 1];
+                    if (lastLine.text && lastLine.text.match(this.labelDef)) {
+                        result.pop();
+                    }
+                    mayRemovePreviousLabel = false;
+                }
+                return;
+            } else {
+                mayRemovePreviousLabel = true;
+            }
+
             match = line.match(this.asmOpcodeRe);
             if (match) {
                 const address = parseInt(match[1], 16);

diff --git a/lib/compiler-finder.js b/lib/compiler-finder.js
@@ -148,6 +148,7 @@ class CompilerFinder {
 
         const supportsBinary = !!props("supportsBinary", true);
         const supportsExecute = supportsBinary && !!props("supportsExecute", true);
+        const supportsLibraryCodeFilter = !!props("supportsLibraryCodeFilter", true);
         const group = props("group", "");
         const demangler = props("demangler", "");
         const isSemVer = props("isSemVer", false);
@@ -184,6 +185,7 @@ class CompilerFinder {
             supportsDemangle: !!demangler,
             supportsBinary: supportsBinary,
             supportsExecute: supportsExecute,
+            supportsLibraryCodeFilter: supportsLibraryCodeFilter,
             postProcess: props("postProcess", "").split("|"),
             lang: langId,
             group: group,

diff --git a/lib/options-handler.js b/lib/options-handler.js
@@ -62,6 +62,10 @@ class ClientOptionsHandler {
             return this.supportsBinary[lang.id] && !!res;
         });
         this.supportsExecute = Object.values(this.supportsExecutePerLanguage).some(value => value);
+
+        this.supportsLibraryCodeFilterPerLanguage = this.compilerProps(languages, 'supportsLibraryCodeFilter', false);
+        this.supportsLibraryCodeFilter = Object.values(this.supportsLibraryCodeFilterPerLanguage).some(value => value);
+
         const libs = this.parseLibraries(this.compilerProps(languages, 'libs'));
         const tools = this.parseTools(this.compilerProps(languages, 'tools'));
 
@@ -85,6 +89,7 @@ class ClientOptionsHandler {
             compileOptions: this.compilerProps(languages, 'defaultOptions', ''),
             supportsBinary: this.supportsBinary,
             supportsExecute: this.supportsExecute,
+            supportsLibraryCodeFilter: this.supportsLibraryCodeFilter,
             languages: languages,
             sources: sources,
             sentryDsn: ceProps('sentryDsn', ''),

diff --git a/static/panes/compiler.js b/static/panes/compiler.js
@@ -393,6 +393,9 @@ Compiler.prototype.getEffectiveFilters = function () {
     if (filters.execute && !this.compiler.supportsExecute) {
         delete filters.execute;
     }
+    if (filters.libraryCode && !this.compiler.supportsLibraryCodeFilter) {
+        delete filters.libraryCode;
+    }
     _.each(this.compiler.disabledFilters, function (filter) {
         if (filters[filter]) {
             delete filters[filter];
@@ -868,6 +871,9 @@ Compiler.prototype.initButtons = function (state) {
     this.filterDirectivesButton = this.domRoot.find("[data-bind='directives']");
     this.filterDirectivesTitle = this.filterDirectivesButton.prop('title');
 
+    this.filterLibraryCodeButton = this.domRoot.find("[data-bind='libraryCode']");
+    this.filterLibraryCodeTitle = this.filterLibraryCodeButton.prop('title');
+
     this.filterCommentsButton = this.domRoot.find("[data-bind='commentOnly']");
     this.filterCommentsTitle = this.filterCommentsButton.prop('title');
 
@@ -882,6 +888,7 @@ Compiler.prototype.initButtons = function (state) {
 
     this.noBinaryFiltersButtons = this.domRoot.find('.nonbinary');
     this.filterExecuteButton.toggle(options.supportsExecute);
+    this.filterLibraryCodeButton.toggle(options.supportsLibraryCodeFilter);
     this.optionsField.val(this.options);
 
     this.shortCompilerName = this.domRoot.find('.short-compiler-name');
@@ -968,6 +975,9 @@ Compiler.prototype.updateButtons = function () {
     var noBinaryFiltersDisabled = !!filters.binary && !this.compiler.supportsFiltersInBinary;
     this.noBinaryFiltersButtons.prop('disabled', noBinaryFiltersDisabled);
 
+    this.filterLibraryCodeButton.prop('disabled', !this.compiler.supportsLibraryCodeFilter);
+    formatFilterTitle(this.filterLibraryCodeButton, this.filterLibraryCodeTitle);
+
     this.filterLabelsButton.prop('disabled', this.compiler.disabledFilters.indexOf('labels') !== -1);
     formatFilterTitle(this.filterLabelsButton, this.filterLabelsTitle);
     this.filterDirectivesButton.prop('disabled', this.compiler.disabledFilters.indexOf('directives') !== -1);

diff --git a/test/cases/gcc-x86-vector.asm.directives.labels.comments.library.json b/test/cases/gcc-x86-vector.asm.directives.labels.comments.library.json
diff --git a/test/cases/nvcc-example.asm.directives.labels.comments.library.json b/test/cases/nvcc-example.asm.directives.labels.comments.library.json
diff --git a/test/filter-tests.js b/test/filter-tests.js
@@ -144,4 +144,16 @@ describe('Filter test cases', function () {
                 {directives: true, commentOnly: true});
         });
     });
+    describe('Directives and library code', function () {
+        cases.forEach(function (x) {
+            testFilter(x, ".directives.library",
+                {directives: true, libraryCode: true});
+        });
+    });
+    describe('Directives, labels, comments and library code', function () {
+        cases.forEach(function (x) {
+            testFilter(x, ".directives.labels.comments.library",
+                {directives: true, labels: true, commentOnly: true, libraryCode: true});
+        });
+    });
 });
diff --git a/views/templates.pug b/views/templates.pug
@@ -72,6 +72,10 @@
           button.btn.btn-light.btn-sm.active.nonbinary(type="button" title="Filter unused labels from the output" data-bind="labels" aria-pressed="true")
             span .LX0:
           input.d-none(type="checkbox" checked=true)
+        .button-checkbox
+          button.btn.btn-light.btn-sm.active.nonbinary(title="Filter functions from other libraries from the output" data-bind="libraryCode" aria-pressed="true")
+            span lib.f:
+          input.d-none(type="checkbox")
         .button-checkbox
           button.btn.btn-light.btn-sm.active.nonbinary(type="button" title="Filter all assembler directives from the output" data-bind="directives" aria-pressed="true")
             span .text