Skip to content

[AutoDiff] NFC: reorganize differentiation SILOptimizer files. #30969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2020
Merged

[AutoDiff] NFC: reorganize differentiation SILOptimizer files. #30969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...timizer/Utils/Differentiation/ADContext.h → .../SILOptimizer/Differentiation/ADContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_ADCONTEXT_H
#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_ADCONTEXT_H

#include "swift/SILOptimizer/Differentiation/Common.h"
#include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"

#include "swift/AST/DiagnosticsSIL.h"
#include "swift/AST/Expr.h"
#include "swift/AST/SynthesizedFileUnit.h"
#include "swift/SIL/SILBuilder.h"
#include "swift/SILOptimizer/Utils/Differentiation/Common.h"
#include "swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SmallPtrSet.h"
Expand Down
1 change: 1 addition & 0 deletions ...izer/Utils/Differentiation/AdjointValue.h → ...LOptimizer/Differentiation/AdjointValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_ADJOINTVALUE_H
#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_ADJOINTVALUE_H

#include "swift/AST/Decl.h"
#include "swift/SIL/SILValue.h"
#include "llvm/ADT/ArrayRef.h"

Expand Down
0 ...LOptimizer/Utils/Differentiation/Common.h → ...ift/SILOptimizer/Differentiation/Common.h
View file
Open in desktop
File renamed without changes.
0 .../Differentiation/DifferentiationInvoker.h → .../Differentiation/DifferentiationInvoker.h
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions ...imizer/Utils/Differentiation/JVPEmitter.h → ...SILOptimizer/Differentiation/JVPEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPEMITTER_H
#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPEMITTER_H

#include "swift/SILOptimizer/Differentiation/AdjointValue.h"
#include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Differentiation/LinearMapInfo.h"

#include "swift/SIL/SILValue.h"
#include "swift/SIL/TypeSubstCloner.h"
#include "swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h"
#include "swift/SILOptimizer/Utils/Differentiation/AdjointValue.h"
#include "swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Utils/Differentiation/LinearMapInfo.h"
#include "llvm/ADT/DenseMap.h"

namespace swift {
Expand Down
0 ...zer/Utils/Differentiation/LinearMapInfo.h → ...Optimizer/Differentiation/LinearMapInfo.h
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions ...r/Utils/Differentiation/PullbackEmitter.h → ...timizer/Differentiation/PullbackEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_PULLBACKEMITTER_H
#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_PULLBACKEMITTER_H

#include "swift/SIL/TypeSubstCloner.h"
#include "swift/SILOptimizer/Differentiation/AdjointValue.h"
#include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Differentiation/LinearMapInfo.h"
#include "swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h"
#include "swift/SILOptimizer/Utils/Differentiation/AdjointValue.h"
#include "swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Utils/Differentiation/LinearMapInfo.h"

#include "swift/SIL/TypeSubstCloner.h"
#include "llvm/ADT/DenseMap.h"

namespace swift {
Expand Down
0 ...ILOptimizer/Utils/Differentiation/Thunk.h → ...wift/SILOptimizer/Differentiation/Thunk.h
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions ...imizer/Utils/Differentiation/VJPEmitter.h → ...SILOptimizer/Differentiation/VJPEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_VJPEMITTER_H
#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_VJPEMITTER_H

#include "swift/SIL/TypeSubstCloner.h"
#include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Differentiation/LinearMapInfo.h"
#include "swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h"
#include "swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Utils/Differentiation/LinearMapInfo.h"

#include "swift/SIL/TypeSubstCloner.h"
#include "llvm/ADT/DenseMap.h"

namespace swift {
Expand Down
2 changes: 1 addition & 1 deletion lib/SILOptimizer/Analysis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ silopt_register_sources(
ClassHierarchyAnalysis.cpp
ClosureScope.cpp
ColdBlockInfo.cpp
DestructorAnalysis.cpp
DifferentiableActivityAnalysis.cpp
DestructorAnalysis.cpp
EscapeAnalysis.cpp
EpilogueARCAnalysis.cpp
FunctionOrder.cpp
Expand Down
3 changes: 2 additions & 1 deletion lib/SILOptimizer/Analysis/DifferentiableActivityAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h"
#include "swift/SILOptimizer/Differentiation/Common.h"

#include "swift/SIL/Projection.h"
#include "swift/SIL/SILArgument.h"
#include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
#include "swift/SILOptimizer/PassManager/PassManager.h"
#include "swift/SILOptimizer/Utils/Differentiation/Common.h"

using namespace swift;
using namespace swift::autodiff;
Expand Down
1 change: 1 addition & 0 deletions lib/SILOptimizer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ endmacro()

add_subdirectory(ARC)
add_subdirectory(Analysis)
add_subdirectory(Differentiation)
add_subdirectory(FunctionSignatureTransforms)
add_subdirectory(IPO)
add_subdirectory(LoopTransforms)
Expand Down
2 changes: 1 addition & 1 deletion ...mizer/Utils/Differentiation/ADContext.cpp → ...ILOptimizer/Differentiation/ADContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Differentiation/ADContext.h"
#include "swift/AST/DiagnosticsSIL.h"
#include "swift/SILOptimizer/PassManager/Transforms.h"

Expand Down
0 ...izer/Utils/Differentiation/CMakeLists.txt → ...LOptimizer/Differentiation/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ptimizer/Utils/Differentiation/Common.cpp → lib/SILOptimizer/Differentiation/Common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/Common.h"
#include "swift/SILOptimizer/Differentiation/Common.h"

namespace swift {
namespace autodiff {
Expand Down
3 changes: 2 additions & 1 deletion ...ifferentiation/DifferentiationInvoker.cpp → ...ifferentiation/DifferentiationInvoker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
//
//===----------------------------------------------------------------------===//

#include "swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h"
#include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"

#include "swift/SIL/SILDifferentiabilityWitness.h"
#include "swift/SIL/SILFunction.h"
#include "swift/SIL/SILInstruction.h"
Expand Down
7 changes: 4 additions & 3 deletions ...izer/Utils/Differentiation/JVPEmitter.cpp → ...LOptimizer/Differentiation/JVPEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/JVPEmitter.h"
#include "swift/SILOptimizer/Differentiation/JVPEmitter.h"
#include "swift/SILOptimizer/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Differentiation/Thunk.h"

#include "swift/SILOptimizer/PassManager/PrettyStackTrace.h"
#include "swift/SILOptimizer/Utils/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Utils/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"

namespace swift {
Expand Down
5 changes: 3 additions & 2 deletions ...r/Utils/Differentiation/LinearMapInfo.cpp → ...timizer/Differentiation/LinearMapInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/LinearMapInfo.h"
#include "swift/SILOptimizer/Differentiation/LinearMapInfo.h"
#include "swift/SILOptimizer/Differentiation/ADContext.h"

#include "swift/AST/DeclContext.h"
#include "swift/AST/ParameterList.h"
#include "swift/AST/SourceFile.h"
#include "swift/SIL/LoopInfo.h"
#include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
#include "swift/SILOptimizer/Utils/Differentiation/ADContext.h"

namespace swift {
namespace autodiff {
Expand Down
9 changes: 5 additions & 4 deletions ...Utils/Differentiation/PullbackEmitter.cpp → ...mizer/Differentiation/PullbackEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/PullbackEmitter.h"
#include "swift/SILOptimizer/Differentiation/PullbackEmitter.h"
#include "swift/SILOptimizer/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Differentiation/VJPEmitter.h"

#include "swift/SIL/InstructionUtils.h"
#include "swift/SIL/Projection.h"
#include "swift/SILOptimizer/PassManager/PrettyStackTrace.h"
#include "swift/SILOptimizer/Utils/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Utils/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Utils/Differentiation/VJPEmitter.h"
#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"

namespace swift {
Expand Down
4 changes: 2 additions & 2 deletions ...Optimizer/Utils/Differentiation/Thunk.cpp → lib/SILOptimizer/Differentiation/Thunk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Differentiation/Common.h"

#include "swift/AST/AnyFunctionRef.h"
#include "swift/AST/GenericSignatureBuilder.h"
#include "swift/AST/Requirement.h"
#include "swift/AST/SubstitutionMap.h"
#include "swift/SILOptimizer/Utils/Differentiation/Common.h"
#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"

namespace swift {
Expand Down
9 changes: 5 additions & 4 deletions ...izer/Utils/Differentiation/VJPEmitter.cpp → ...LOptimizer/Differentiation/VJPEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@

#define DEBUG_TYPE "differentiation"

#include "swift/SILOptimizer/Utils/Differentiation/VJPEmitter.h"
#include "swift/SILOptimizer/Differentiation/VJPEmitter.h"
#include "swift/SILOptimizer/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Differentiation/PullbackEmitter.h"
#include "swift/SILOptimizer/Differentiation/Thunk.h"

#include "swift/SILOptimizer/PassManager/PrettyStackTrace.h"
#include "swift/SILOptimizer/Utils/CFGOptUtils.h"
#include "swift/SILOptimizer/Utils/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Utils/Differentiation/PullbackEmitter.h"
#include "swift/SILOptimizer/Utils/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"

namespace swift {
Expand Down
8 changes: 4 additions & 4 deletions lib/SILOptimizer/Mandatory/Differentiation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
#include "swift/SIL/SILBuilder.h"
#include "swift/SIL/TypeSubstCloner.h"
#include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
#include "swift/SILOptimizer/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Differentiation/JVPEmitter.h"
#include "swift/SILOptimizer/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Differentiation/VJPEmitter.h"
#include "swift/SILOptimizer/PassManager/Passes.h"
#include "swift/SILOptimizer/PassManager/Transforms.h"
#include "swift/SILOptimizer/Utils/Differentiation/ADContext.h"
#include "swift/SILOptimizer/Utils/Differentiation/JVPEmitter.h"
#include "swift/SILOptimizer/Utils/Differentiation/Thunk.h"
#include "swift/SILOptimizer/Utils/Differentiation/VJPEmitter.h"
#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
#include "llvm/ADT/APSInt.h"
#include "llvm/ADT/BreadthFirstIterator.h"
Expand Down
2 changes: 0 additions & 2 deletions lib/SILOptimizer/Utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
add_subdirectory(Differentiation)

silopt_register_sources(
BasicBlockOptUtils.cpp
CFGOptUtils.cpp
Expand Down