[PATCH] D72404: [WIP][ThinLTO] Support Os and Oz
merge_guards_bot added a comment.
{icon times-circle color=red} Unit tests: fail. 61849 tests passed, 1 failed
and 781 were skipped.
failed: Clang.CodeGen/thinlto-debug-pm.c
{icon question-circle color=gray} clang-tidy: unknown.
{icon times-circle color=red} clang-format: fail. Please format your changes
with clang-format by running `git-clang-format HEAD^` or applying this patch
.
Build artifacts
:
diff.json
,
clang-format.patch
,
CMakeCache.txt
,
console-log.txt
,
test-results.xml
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72404/new/
https://reviews.llvm.org/D72404
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D72404: [WIP][ThinLTO] Support Os and Oz
merge_guards_bot added a comment.
{icon times-circle color=red} Unit tests: fail. 60543 tests passed, 1 failed
and 726 were skipped.
failed: Clang.CodeGen/thinlto-debug-pm.c
{icon question-circle color=gray} clang-tidy: unknown.
{icon times-circle color=red} clang-format: fail. Please format your changes
with clang-format by running `git-clang-format HEAD^` or applying this patch
.
Build artifacts
:
diff.json
,
clang-format.patch
,
CMakeCache.txt
,
console-log.txt
,
test-results.xml
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72404/new/
https://reviews.llvm.org/D72404
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D72404: [WIP][ThinLTO] Support Os and Oz
merge_guards_bot added a comment.
{icon times-circle color=red} Unit tests: fail. 60543 tests passed, 1 failed
and 726 were skipped.
failed: Clang.CodeGen/thinlto-debug-pm.c
{icon question-circle color=gray} clang-tidy: unknown.
{icon times-circle color=red} clang-format: fail. Please format your changes
with clang-format by running `git-clang-format HEAD^` or applying this patch
.
Build artifacts
:
diff.json
,
clang-format.patch
,
CMakeCache.txt
,
console-log.txt
,
test-results.xml
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72404/new/
https://reviews.llvm.org/D72404
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D72404: [WIP][ThinLTO] Support Os and Oz
ychen updated this revision to Diff 238042.
ychen added a comment.
- Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72404/new/
https://reviews.llvm.org/D72404
Files:
clang/lib/CodeGen/BackendUtil.cpp
clang/test/CodeGen/thinlto-debug-pm.c
lld/COFF/Config.h
lld/COFF/Driver.cpp
lld/COFF/LTO.cpp
lld/ELF/Config.h
lld/ELF/Driver.cpp
lld/ELF/LTO.cpp
lld/test/COFF/lto-opt-level.ll
lld/test/ELF/lto/opt-level.ll
lld/test/wasm/lto/opt-level.ll
lld/wasm/Config.h
lld/wasm/Driver.cpp
lld/wasm/LTO.cpp
llvm/include/llvm/LTO/Config.h
llvm/include/llvm/LTO/LTO.h
llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
llvm/lib/LTO/LTO.cpp
llvm/lib/LTO/LTOBackend.cpp
llvm/lib/LTO/LTOCodeGenerator.cpp
llvm/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/test/LTO/X86/Inputs/opt-level-size.ll
llvm/test/LTO/X86/opt-level-size.ll
llvm/test/tools/lto/opt-level.ll
llvm/tools/gold/gold-plugin.cpp
llvm/tools/llvm-lto/llvm-lto.cpp
llvm/tools/llvm-lto2/llvm-lto2.cpp
llvm/tools/lto/lto.cpp
Index: llvm/tools/lto/lto.cpp
===
--- llvm/tools/lto/lto.cpp
+++ llvm/tools/lto/lto.cpp
@@ -28,14 +28,13 @@
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/raw_ostream.h"
-// extra command-line flags needed for LTOCodeGenerator
-static cl::opt
+static cl::opt
OptLevel("O",
- cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
+ cl::desc("Optimization level. [-O0, -O1, -O2, -Os, -Oz or -O3] "
"(default = '-O2')"),
cl::Prefix,
cl::ZeroOrMore,
- cl::init('2'));
+ cl::init("2"));
static cl::opt
DisableInline("disable-inlining", cl::init(false),
@@ -165,9 +164,15 @@
CG->setAttr(attrs);
}
- if (OptLevel < '0' || OptLevel > '3')
-report_fatal_error("Optimization level must be between 0 and 3");
- CG->setOptLevel(OptLevel - '0');
+ LLVMContext = CG->getContext();
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getOptLevel(OptLevel)))
+CG->setOptLevel(*Result);
+
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getSizeLevel(OptLevel)))
+CG->setSizeLevel(*Result);
+
CG->setFreestanding(EnableFreestanding);
}
@@ -487,25 +492,19 @@
CodeGen->setTargetOptions(InitTargetOptionsFromCodeGenFlags());
CodeGen->setFreestanding(EnableFreestanding);
- if (OptLevel.getNumOccurrences()) {
-if (OptLevel < '0' || OptLevel > '3')
- report_fatal_error("Optimization level must be between 0 and 3");
-CodeGen->setOptLevel(OptLevel - '0');
-switch (OptLevel) {
-case '0':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::None);
- break;
-case '1':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Less);
- break;
-case '2':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Default);
- break;
-case '3':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Aggressive);
- break;
-}
- }
+ LLVMContext Ctx;
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getOptLevel(OptLevel)))
+CodeGen->setOptLevel(*Result);
+ else
+return nullptr;
+
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getSizeLevel(OptLevel)))
+CodeGen->setSizeLevel(*Result);
+ else
+return nullptr;
+
return wrap(CodeGen);
}
Index: llvm/tools/llvm-lto2/llvm-lto2.cpp
===
--- llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -29,10 +29,11 @@
using namespace llvm;
using namespace lto;
-static cl::opt
-OptLevel("O", cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
- "(default = '-O2')"),
- cl::Prefix, cl::ZeroOrMore, cl::init('2'));
+static cl::opt
+OptLevel("O",
+ cl::desc("Optimization level. [-O0, -O1, -O2, -Os, -Oz, or "
+ "-O3] (default = '-O2')"),
+ cl::Prefix, cl::ZeroOrMore, cl::init("2"));
static cl::opt CGOptLevel(
"cg-opt-level",
@@ -244,7 +245,10 @@
Conf.OptPipeline = OptPipeline;
Conf.AAPipeline = AAPipeline;
- Conf.OptLevel = OptLevel - '0';
+ Conf.OptLevel =
+ check(llvm::lto::getOptLevel(OptLevel), "invalid optimization level");
+ Conf.SizeLevel =
+ check(llvm::lto::getSizeLevel(OptLevel), "invalid optimization level");
Conf.UseNewPM = UseNewPM;
switch (CGOptLevel) {
case '0':
Index: llvm/tools/llvm-lto/llvm-lto.cpp
===
--- llvm/tools/llvm-lto/llvm-lto.cpp
+++ llvm/tools/llvm-lto/llvm-lto.cpp
@@ -62,10 +62,10 @@
using namespace llvm;
-static cl::opt
-OptLevel("O", cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
- "(default = '-O2')"),
[PATCH] D72404: [WIP][ThinLTO] Support Os and Oz
ychen updated this revision to Diff 238034.
ychen added a comment.
- fix a typo
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72404/new/
https://reviews.llvm.org/D72404
Files:
clang/lib/CodeGen/BackendUtil.cpp
clang/test/CodeGen/thinlto-debug-pm.c
lld/COFF/Config.h
lld/COFF/Driver.cpp
lld/COFF/LTO.cpp
lld/ELF/Config.h
lld/ELF/Driver.cpp
lld/ELF/LTO.cpp
lld/test/COFF/lto-opt-level.ll
lld/test/ELF/lto/opt-level.ll
lld/test/wasm/lto/opt-level.ll
lld/wasm/Config.h
lld/wasm/Driver.cpp
lld/wasm/LTO.cpp
llvm/include/llvm/LTO/Config.h
llvm/include/llvm/LTO/LTO.h
llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
llvm/lib/LTO/LTO.cpp
llvm/lib/LTO/LTOBackend.cpp
llvm/lib/LTO/LTOCodeGenerator.cpp
llvm/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/test/LTO/X86/Inputs/opt-level-size.ll
llvm/test/LTO/X86/opt-level-size.ll
llvm/test/tools/lto/opt-level.ll
llvm/tools/gold/gold-plugin.cpp
llvm/tools/llvm-lto/llvm-lto.cpp
llvm/tools/llvm-lto2/llvm-lto2.cpp
llvm/tools/lto/lto.cpp
Index: llvm/tools/lto/lto.cpp
===
--- llvm/tools/lto/lto.cpp
+++ llvm/tools/lto/lto.cpp
@@ -28,14 +28,13 @@
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/raw_ostream.h"
-// extra command-line flags needed for LTOCodeGenerator
-static cl::opt
+static cl::opt
OptLevel("O",
- cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
+ cl::desc("Optimization level. [-O0, -O1, -O2, -Os, -Oz or -O3] "
"(default = '-O2')"),
cl::Prefix,
cl::ZeroOrMore,
- cl::init('2'));
+ cl::init("2"));
static cl::opt
DisableInline("disable-inlining", cl::init(false),
@@ -165,9 +164,15 @@
CG->setAttr(attrs);
}
- if (OptLevel < '0' || OptLevel > '3')
-report_fatal_error("Optimization level must be between 0 and 3");
- CG->setOptLevel(OptLevel - '0');
+ LLVMContext = CG->getContext();
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getOptLevel(OptLevel)))
+CG->setOptLevel(*Result);
+
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getSizeLevel(OptLevel)))
+CG->setSizeLevel(*Result);
+
CG->setFreestanding(EnableFreestanding);
}
@@ -487,25 +492,19 @@
CodeGen->setTargetOptions(InitTargetOptionsFromCodeGenFlags());
CodeGen->setFreestanding(EnableFreestanding);
- if (OptLevel.getNumOccurrences()) {
-if (OptLevel < '0' || OptLevel > '3')
- report_fatal_error("Optimization level must be between 0 and 3");
-CodeGen->setOptLevel(OptLevel - '0');
-switch (OptLevel) {
-case '0':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::None);
- break;
-case '1':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Less);
- break;
-case '2':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Default);
- break;
-case '3':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Aggressive);
- break;
-}
- }
+ LLVMContext Ctx;
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getOptLevel(OptLevel)))
+CodeGen->setOptLevel(*Result);
+ else
+return nullptr;
+
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getSizeLevel(OptLevel)))
+CodeGen->setSizeLevel(*Result);
+ else
+return nullptr;
+
return wrap(CodeGen);
}
Index: llvm/tools/llvm-lto2/llvm-lto2.cpp
===
--- llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -29,10 +29,11 @@
using namespace llvm;
using namespace lto;
-static cl::opt
-OptLevel("O", cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
- "(default = '-O2')"),
- cl::Prefix, cl::ZeroOrMore, cl::init('2'));
+static cl::opt
+OptLevel("O",
+ cl::desc("Optimization level. [-O0, -O1, -O2, -Os, -Oz, or "
+ "-O3] (default = '-O2')"),
+ cl::Prefix, cl::ZeroOrMore, cl::init("2"));
static cl::opt CGOptLevel(
"cg-opt-level",
@@ -244,7 +245,10 @@
Conf.OptPipeline = OptPipeline;
Conf.AAPipeline = AAPipeline;
- Conf.OptLevel = OptLevel - '0';
+ Conf.OptLevel =
+ check(llvm::lto::getOptLevel(OptLevel), "invalid optimization level");
+ Conf.SizeLevel =
+ check(llvm::lto::getSizeLevel(OptLevel), "invalid optimization level");
Conf.UseNewPM = UseNewPM;
switch (CGOptLevel) {
case '0':
Index: llvm/tools/llvm-lto/llvm-lto.cpp
===
--- llvm/tools/llvm-lto/llvm-lto.cpp
+++ llvm/tools/llvm-lto/llvm-lto.cpp
@@ -62,10 +62,10 @@
using namespace llvm;
-static cl::opt
-OptLevel("O", cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
- "(default =
[PATCH] D72404: [WIP][ThinLTO] Support Os and Oz
ychen updated this revision to Diff 238028.
ychen added a comment.
Herald added subscribers: cfe-commits, jfb.
Herald added a project: clang.
- when optnone is not present, add `optsize` for Os and `minsize` for Oz
- add Os Oz function attribute test.
- add Os Oz pipeline test
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72404/new/
https://reviews.llvm.org/D72404
Files:
clang/lib/CodeGen/BackendUtil.cpp
clang/test/CodeGen/thinlto-debug-pm.c
lld/COFF/Config.h
lld/COFF/Driver.cpp
lld/COFF/LTO.cpp
lld/ELF/Config.h
lld/ELF/Driver.cpp
lld/ELF/LTO.cpp
lld/test/COFF/lto-opt-level.ll
lld/test/ELF/lto/opt-level.ll
lld/test/wasm/lto/opt-level.ll
lld/wasm/Config.h
lld/wasm/Driver.cpp
lld/wasm/LTO.cpp
llvm/include/llvm/LTO/Config.h
llvm/include/llvm/LTO/LTO.h
llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
llvm/lib/LTO/LTO.cpp
llvm/lib/LTO/LTOBackend.cpp
llvm/lib/LTO/LTOCodeGenerator.cpp
llvm/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/test/LTO/X86/Inputs/opt-level-size.ll
llvm/test/LTO/X86/opt-level-size.ll
llvm/test/tools/lto/opt-level.ll
llvm/tools/gold/gold-plugin.cpp
llvm/tools/llvm-lto/llvm-lto.cpp
llvm/tools/llvm-lto2/llvm-lto2.cpp
llvm/tools/lto/lto.cpp
Index: llvm/tools/lto/lto.cpp
===
--- llvm/tools/lto/lto.cpp
+++ llvm/tools/lto/lto.cpp
@@ -28,14 +28,13 @@
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/raw_ostream.h"
-// extra command-line flags needed for LTOCodeGenerator
-static cl::opt
+static cl::opt
OptLevel("O",
- cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
+ cl::desc("Optimization level. [-O0, -O1, -O2, -Os, -Oz or -O3] "
"(default = '-O2')"),
cl::Prefix,
cl::ZeroOrMore,
- cl::init('2'));
+ cl::init("2"));
static cl::opt
DisableInline("disable-inlining", cl::init(false),
@@ -165,9 +164,15 @@
CG->setAttr(attrs);
}
- if (OptLevel < '0' || OptLevel > '3')
-report_fatal_error("Optimization level must be between 0 and 3");
- CG->setOptLevel(OptLevel - '0');
+ LLVMContext = CG->getContext();
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getOptLevel(OptLevel)))
+CG->setOptLevel(*Result);
+
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getSizeLevel(OptLevel)))
+CG->setSizeLevel(*Result);
+
CG->setFreestanding(EnableFreestanding);
}
@@ -487,25 +492,19 @@
CodeGen->setTargetOptions(InitTargetOptionsFromCodeGenFlags());
CodeGen->setFreestanding(EnableFreestanding);
- if (OptLevel.getNumOccurrences()) {
-if (OptLevel < '0' || OptLevel > '3')
- report_fatal_error("Optimization level must be between 0 and 3");
-CodeGen->setOptLevel(OptLevel - '0');
-switch (OptLevel) {
-case '0':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::None);
- break;
-case '1':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Less);
- break;
-case '2':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Default);
- break;
-case '3':
- CodeGen->setCodeGenOptLevel(CodeGenOpt::Aggressive);
- break;
-}
- }
+ LLVMContext Ctx;
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getOptLevel(OptLevel)))
+CodeGen->setOptLevel(*Result);
+ else
+return nullptr;
+
+ if (ErrorOr Result = expectedToErrorOrAndEmitErrors(
+ Ctx, llvm::lto::getSizeLevel(OptLevel)))
+CodeGen->setSizeLevel(*Result);
+ else
+return nullptr;
+
return wrap(CodeGen);
}
Index: llvm/tools/llvm-lto2/llvm-lto2.cpp
===
--- llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -29,10 +29,11 @@
using namespace llvm;
using namespace lto;
-static cl::opt
-OptLevel("O", cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
- "(default = '-O2')"),
- cl::Prefix, cl::ZeroOrMore, cl::init('2'));
+static cl::opt
+OptLevel("O",
+ cl::desc("Optimization level. [-O0, -O1, -O2, -Os, -Oz, or "
+ "-O3] (default = '-O2')"),
+ cl::Prefix, cl::ZeroOrMore, cl::init("2"));
static cl::opt CGOptLevel(
"cg-opt-level",
@@ -244,7 +245,10 @@
Conf.OptPipeline = OptPipeline;
Conf.AAPipeline = AAPipeline;
- Conf.OptLevel = OptLevel - '0';
+ Conf.OptLevel =
+ check(llvm::lto::getOptLevel(OptLevel), "invalid optimization level");
+ Conf.SizeLevel =
+ check(llvm::lto::getSizeLevel(OptLevel), "invalid optimization level");
Conf.UseNewPM = UseNewPM;
switch (CGOptLevel) {
case '0':
Index: llvm/tools/llvm-lto/llvm-lto.cpp
===
--- llvm/tools/llvm-lto/llvm-lto.cpp
+++
