-
Notifications
You must be signed in to change notification settings - Fork 409
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrate LLVM at llvm/llvm-project@e0e615efac52
Updates LLVM usage to match [e0e615efac52](llvm/llvm-project@e0e615efac52) PiperOrigin-RevId: 621895828
- Loading branch information
1 parent
3d6326c
commit 50483c8
Showing
4 changed files
with
122 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,60 @@ | ||
| Auto generated patch. Do not edit or delete it, even if empty. | ||
| diff -ruN --strip-trailing-cr a/clang/include/clang/Frontend/FrontendOptions.h b/clang/include/clang/Frontend/FrontendOptions.h | ||
| --- a/clang/include/clang/Frontend/FrontendOptions.h | ||
| +++ b/clang/include/clang/Frontend/FrontendOptions.h | ||
| @@ -580,7 +580,9 @@ | ||
| BuildingImplicitModuleUsesLock(true), ModulesEmbedAllFiles(false), | ||
| IncludeTimestamps(true), UseTemporary(true), | ||
| AllowPCMWithCompilerErrors(false), ModulesShareFileManager(true), | ||
| - TimeTraceGranularity(500) {} | ||
| + EmitSymbolGraph(false), EmitExtensionSymbolGraphs(false), | ||
| + EmitSymbolGraphSymbolLabelsForTesting(false), | ||
| + EmitPrettySymbolGraphs(false), TimeTraceGranularity(500) {} | ||
|
|
||
| /// getInputKindForExtension - Return the appropriate input kind for a file | ||
| /// extension. For example, "c" would return Language::C. | ||
| diff -ruN --strip-trailing-cr a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | ||
| --- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | ||
| +++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | ||
| @@ -6276,15 +6276,14 @@ | ||
| bool CombinerHelper::matchCommuteConstantToRHS(MachineInstr &MI) { | ||
| Register LHS = MI.getOperand(1).getReg(); | ||
| Register RHS = MI.getOperand(2).getReg(); | ||
| - if (!getIConstantVRegVal(LHS, MRI)) { | ||
| - // Skip commuting if LHS is not a constant. But, LHS may be a | ||
| - // G_CONSTANT_FOLD_BARRIER. If so we commute as long as we don't already | ||
| - // have a constant on the RHS. | ||
| - if (MRI.getVRegDef(LHS)->getOpcode() != | ||
| - TargetOpcode::G_CONSTANT_FOLD_BARRIER) | ||
| - return false; | ||
| - } | ||
| - // Commute as long as RHS is not a constant or G_CONSTANT_FOLD_BARRIER. | ||
| + auto *LHSDef = MRI.getVRegDef(LHS); | ||
| + if (getIConstantVRegVal(LHS, MRI).has_value()) | ||
| + return true; | ||
| + | ||
| + // LHS may be a G_CONSTANT_FOLD_BARRIER. If so we commute | ||
| + // as long as we don't already have a constant on the RHS. | ||
| + if (LHSDef->getOpcode() != TargetOpcode::G_CONSTANT_FOLD_BARRIER) | ||
| + return false; | ||
| return MRI.getVRegDef(RHS)->getOpcode() != | ||
| TargetOpcode::G_CONSTANT_FOLD_BARRIER && | ||
| !getIConstantVRegVal(RHS, MRI); | ||
| diff -ruN --strip-trailing-cr a/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir b/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir | ||
| --- a/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir | ||
| +++ b/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir | ||
| @@ -1,28 +0,0 @@ | ||
| -# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 4 | ||
| -# RUN: llc -mtriple aarch64 -run-pass=aarch64-prelegalizer-combiner %s -o - \ | ||
| -# RUN: --aarch64prelegalizercombiner-disable-rule=constant_fold_binop | FileCheck %s | ||
| - | ||
| -# `constant_fold_binop` is disabled to trigger the infinite loop in `commute_int_constant_to_rhs`. | ||
| - | ||
| ---- | ||
| -name: add | ||
| -tracksRegLiveness: true | ||
| -body: | | ||
| - bb.0: | ||
| - liveins: $s0 | ||
| - | ||
| - ; CHECK-LABEL: name: add | ||
| - ; CHECK: liveins: $s0 | ||
| - ; CHECK-NEXT: {{ $}} | ||
| - ; CHECK-NEXT: %c0:_(s32) = G_CONSTANT i32 1 | ||
| - ; CHECK-NEXT: %c1:_(s32) = G_CONSTANT i32 2 | ||
| - ; CHECK-NEXT: %add:_(s32) = G_ADD %c0, %c1 | ||
| - ; CHECK-NEXT: $s0 = COPY %add(s32) | ||
| - ; CHECK-NEXT: RET_ReallyLR | ||
| - %c0:_(s32) = G_CONSTANT i32 1 | ||
| - %c1:_(s32) = G_CONSTANT i32 2 | ||
| - %add:_(s32) = G_ADD %c0, %c1 | ||
| - $s0 = COPY %add | ||
| - RET_ReallyLR | ||
| - | ||
| -... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,60 @@ | ||
| Auto generated patch. Do not edit or delete it, even if empty. | ||
| diff -ruN --strip-trailing-cr a/clang/include/clang/Frontend/FrontendOptions.h b/clang/include/clang/Frontend/FrontendOptions.h | ||
| --- a/clang/include/clang/Frontend/FrontendOptions.h | ||
| +++ b/clang/include/clang/Frontend/FrontendOptions.h | ||
| @@ -580,7 +580,9 @@ | ||
| BuildingImplicitModuleUsesLock(true), ModulesEmbedAllFiles(false), | ||
| IncludeTimestamps(true), UseTemporary(true), | ||
| AllowPCMWithCompilerErrors(false), ModulesShareFileManager(true), | ||
| - TimeTraceGranularity(500) {} | ||
| + EmitSymbolGraph(false), EmitExtensionSymbolGraphs(false), | ||
| + EmitSymbolGraphSymbolLabelsForTesting(false), | ||
| + EmitPrettySymbolGraphs(false), TimeTraceGranularity(500) {} | ||
|
|
||
| /// getInputKindForExtension - Return the appropriate input kind for a file | ||
| /// extension. For example, "c" would return Language::C. | ||
| diff -ruN --strip-trailing-cr a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | ||
| --- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | ||
| +++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | ||
| @@ -6276,15 +6276,14 @@ | ||
| bool CombinerHelper::matchCommuteConstantToRHS(MachineInstr &MI) { | ||
| Register LHS = MI.getOperand(1).getReg(); | ||
| Register RHS = MI.getOperand(2).getReg(); | ||
| - if (!getIConstantVRegVal(LHS, MRI)) { | ||
| - // Skip commuting if LHS is not a constant. But, LHS may be a | ||
| - // G_CONSTANT_FOLD_BARRIER. If so we commute as long as we don't already | ||
| - // have a constant on the RHS. | ||
| - if (MRI.getVRegDef(LHS)->getOpcode() != | ||
| - TargetOpcode::G_CONSTANT_FOLD_BARRIER) | ||
| - return false; | ||
| - } | ||
| - // Commute as long as RHS is not a constant or G_CONSTANT_FOLD_BARRIER. | ||
| + auto *LHSDef = MRI.getVRegDef(LHS); | ||
| + if (getIConstantVRegVal(LHS, MRI).has_value()) | ||
| + return true; | ||
| + | ||
| + // LHS may be a G_CONSTANT_FOLD_BARRIER. If so we commute | ||
| + // as long as we don't already have a constant on the RHS. | ||
| + if (LHSDef->getOpcode() != TargetOpcode::G_CONSTANT_FOLD_BARRIER) | ||
| + return false; | ||
| return MRI.getVRegDef(RHS)->getOpcode() != | ||
| TargetOpcode::G_CONSTANT_FOLD_BARRIER && | ||
| !getIConstantVRegVal(RHS, MRI); | ||
| diff -ruN --strip-trailing-cr a/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir b/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir | ||
| --- a/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir | ||
| +++ b/llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-int-const-lhs.mir | ||
| @@ -1,28 +0,0 @@ | ||
| -# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 4 | ||
| -# RUN: llc -mtriple aarch64 -run-pass=aarch64-prelegalizer-combiner %s -o - \ | ||
| -# RUN: --aarch64prelegalizercombiner-disable-rule=constant_fold_binop | FileCheck %s | ||
| - | ||
| -# `constant_fold_binop` is disabled to trigger the infinite loop in `commute_int_constant_to_rhs`. | ||
| - | ||
| ---- | ||
| -name: add | ||
| -tracksRegLiveness: true | ||
| -body: | | ||
| - bb.0: | ||
| - liveins: $s0 | ||
| - | ||
| - ; CHECK-LABEL: name: add | ||
| - ; CHECK: liveins: $s0 | ||
| - ; CHECK-NEXT: {{ $}} | ||
| - ; CHECK-NEXT: %c0:_(s32) = G_CONSTANT i32 1 | ||
| - ; CHECK-NEXT: %c1:_(s32) = G_CONSTANT i32 2 | ||
| - ; CHECK-NEXT: %add:_(s32) = G_ADD %c0, %c1 | ||
| - ; CHECK-NEXT: $s0 = COPY %add(s32) | ||
| - ; CHECK-NEXT: RET_ReallyLR | ||
| - %c0:_(s32) = G_CONSTANT i32 1 | ||
| - %c1:_(s32) = G_CONSTANT i32 2 | ||
| - %add:_(s32) = G_ADD %c0, %c1 | ||
| - $s0 = COPY %add | ||
| - RET_ReallyLR | ||
| - | ||
| -... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters