From 8972b43abbfb1773b2997da06873ec5fc2c94e6f Mon Sep 17 00:00:00 2001 From: Michael Gottesman Date: Thu, 8 Dec 2016 18:21:37 -0800 Subject: [PATCH] [sil-tooling] Rename sil-sort-output => emit-sorted-sil. This standardizes on the name used for the same option in swiftc. --- test/SIL/Serialization/semanticsattr.sil | 2 +- test/SILOptimizer/inlinecaches_arc.sil | 2 +- test/SILOptimizer/loop-region-analysis.sil | 2 +- tools/sil-func-extractor/SILFunctionExtractor.cpp | 6 ++++++ tools/sil-opt/SILOpt.cpp | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/SIL/Serialization/semanticsattr.sil b/test/SIL/Serialization/semanticsattr.sil index 68b226548cc..ea02efe3c24 100644 --- a/test/SIL/Serialization/semanticsattr.sil +++ b/test/SIL/Serialization/semanticsattr.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -parse-sil -emit-sib -parse-as-library -parse-stdlib -module-name SemanticsAttr -o %t/SemanticsAttr.sib %s -// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil %t/SemanticsAttr.sib -o - -sil-sort-output | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil %t/SemanticsAttr.sib -o - -emit-sorted-sil | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inlinecaches_arc.sil b/test/SILOptimizer/inlinecaches_arc.sil index bc5a6ae3f90..83d21765b4a 100644 --- a/test/SILOptimizer/inlinecaches_arc.sil +++ b/test/SILOptimizer/inlinecaches_arc.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -specdevirt -code-sinking -sil-sort-output | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -specdevirt -code-sinking -emit-sorted-sil | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/loop-region-analysis.sil b/test/SILOptimizer/loop-region-analysis.sil index 941b3896e06..58b0b11e1e9 100644 --- a/test/SILOptimizer/loop-region-analysis.sil +++ b/test/SILOptimizer/loop-region-analysis.sil @@ -1,4 +1,4 @@ -// All bbs should have IDs that match the rpo order put out when printing with -sil-sort-output +// All bbs should have IDs that match the rpo order put out when printing with -emit-sorted-sil // RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil %s -module-name Swift -loop-region-view-text -o /dev/null | %FileCheck %s diff --git a/tools/sil-func-extractor/SILFunctionExtractor.cpp b/tools/sil-func-extractor/SILFunctionExtractor.cpp index 384fd22658d..4e1be2ba637 100644 --- a/tools/sil-func-extractor/SILFunctionExtractor.cpp +++ b/tools/sil-func-extractor/SILFunctionExtractor.cpp @@ -90,6 +90,12 @@ static llvm::cl::opt static llvm::cl::opt Triple("target", llvm::cl::desc("target triple")); +static llvm::cl::opt +EnableSILSortOutput("emit-sorted-sil", llvm::cl::Hidden, + llvm::cl::init(false), + llvm::cl::desc("Sort Functions, VTables, Globals, " + "WitnessTables by name to ease diffing.")); + static llvm::cl::opt AssumeUnqualifiedOwnershipWhenParsing( "assume-parsing-unqualified-ownership-sil", llvm::cl::Hidden, llvm::cl::init(false), diff --git a/tools/sil-opt/SILOpt.cpp b/tools/sil-opt/SILOpt.cpp index e71bcc28909..7c5d7a30ce5 100644 --- a/tools/sil-opt/SILOpt.cpp +++ b/tools/sil-opt/SILOpt.cpp @@ -143,7 +143,7 @@ static llvm::cl::opt ModuleCachePath("module-cache-path", llvm::cl::desc("Clang module cache path")); static llvm::cl::opt -EnableSILSortOutput("sil-sort-output", llvm::cl::Hidden, +EnableSILSortOutput("emit-sorted-sil", llvm::cl::Hidden, llvm::cl::init(false), llvm::cl::desc("Sort Functions, VTables, Globals, " "WitnessTables by name to ease diffing."));