From 2276a2e40d5ce7072dd58028799bf1931608f603 Mon Sep 17 00:00:00 2001
From: Dan Zheng <danielzheng@google.com>
Date: Fri, 10 Apr 2020 19:41:14 -0700
Subject: [PATCH] [AutoDiff] NFC: reorganize differentiation SILOptimizer
 files.

Move differentiation-related SILOptimizer files to
{include/swift,lib}/SILOptimizer/Differentiation/.

This reduces directory nesting and gathers files together.
---
 .../SILOptimizer/{Utils => }/Differentiation/ADContext.h | 5 +++--
 .../{Utils => }/Differentiation/AdjointValue.h           | 1 +
 .../SILOptimizer/{Utils => }/Differentiation/Common.h    | 0
 .../{Utils => }/Differentiation/DifferentiationInvoker.h | 0
 .../{Utils => }/Differentiation/JVPEmitter.h             | 7 ++++---
 .../{Utils => }/Differentiation/LinearMapInfo.h          | 0
 .../{Utils => }/Differentiation/PullbackEmitter.h        | 9 +++++----
 .../SILOptimizer/{Utils => }/Differentiation/Thunk.h     | 0
 .../{Utils => }/Differentiation/VJPEmitter.h             | 7 ++++---
 lib/SILOptimizer/Analysis/CMakeLists.txt                 | 2 +-
 .../Analysis/DifferentiableActivityAnalysis.cpp          | 3 ++-
 lib/SILOptimizer/CMakeLists.txt                          | 1 +
 .../{Utils => }/Differentiation/ADContext.cpp            | 2 +-
 .../{Utils => }/Differentiation/CMakeLists.txt           | 0
 lib/SILOptimizer/{Utils => }/Differentiation/Common.cpp  | 2 +-
 .../Differentiation/DifferentiationInvoker.cpp           | 3 ++-
 .../{Utils => }/Differentiation/JVPEmitter.cpp           | 7 ++++---
 .../{Utils => }/Differentiation/LinearMapInfo.cpp        | 5 +++--
 .../{Utils => }/Differentiation/PullbackEmitter.cpp      | 9 +++++----
 lib/SILOptimizer/{Utils => }/Differentiation/Thunk.cpp   | 4 ++--
 .../{Utils => }/Differentiation/VJPEmitter.cpp           | 9 +++++----
 lib/SILOptimizer/Mandatory/Differentiation.cpp           | 8 ++++----
 lib/SILOptimizer/Utils/CMakeLists.txt                    | 2 --
 23 files changed, 48 insertions(+), 38 deletions(-)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/ADContext.h (99%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/AdjointValue.h (99%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/Common.h (100%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/DifferentiationInvoker.h (100%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/JVPEmitter.h (98%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/LinearMapInfo.h (100%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/PullbackEmitter.h (98%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/Thunk.h (100%)
 rename include/swift/SILOptimizer/{Utils => }/Differentiation/VJPEmitter.h (97%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/ADContext.cpp (98%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/CMakeLists.txt (100%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/Common.cpp (99%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/DifferentiationInvoker.cpp (97%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/JVPEmitter.cpp (99%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/LinearMapInfo.cpp (99%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/PullbackEmitter.cpp (99%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/Thunk.cpp (99%)
 rename lib/SILOptimizer/{Utils => }/Differentiation/VJPEmitter.cpp (99%)

diff --git a/include/swift/SILOptimizer/Utils/Differentiation/ADContext.h b/include/swift/SILOptimizer/Differentiation/ADContext.h
similarity index 99%
rename from include/swift/SILOptimizer/Utils/Differentiation/ADContext.h
rename to include/swift/SILOptimizer/Differentiation/ADContext.h
index 8b28296d37b73..b6cd81bf8af76 100644
--- a/include/swift/SILOptimizer/Utils/Differentiation/ADContext.h
+++ b/include/swift/SILOptimizer/Differentiation/ADContext.h
@@ -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"
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/AdjointValue.h b/include/swift/SILOptimizer/Differentiation/AdjointValue.h
similarity index 99%
rename from include/swift/SILOptimizer/Utils/Differentiation/AdjointValue.h
rename to include/swift/SILOptimizer/Differentiation/AdjointValue.h
index c8b88844dc493..8ea4676fbe015 100644
--- a/include/swift/SILOptimizer/Utils/Differentiation/AdjointValue.h
+++ b/include/swift/SILOptimizer/Differentiation/AdjointValue.h
@@ -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"
 
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/Common.h b/include/swift/SILOptimizer/Differentiation/Common.h
similarity index 100%
rename from include/swift/SILOptimizer/Utils/Differentiation/Common.h
rename to include/swift/SILOptimizer/Differentiation/Common.h
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h b/include/swift/SILOptimizer/Differentiation/DifferentiationInvoker.h
similarity index 100%
rename from include/swift/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.h
rename to include/swift/SILOptimizer/Differentiation/DifferentiationInvoker.h
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/JVPEmitter.h b/include/swift/SILOptimizer/Differentiation/JVPEmitter.h
similarity index 98%
rename from include/swift/SILOptimizer/Utils/Differentiation/JVPEmitter.h
rename to include/swift/SILOptimizer/Differentiation/JVPEmitter.h
index 728ea94b7a130..509a0ec992cc9 100644
--- a/include/swift/SILOptimizer/Utils/Differentiation/JVPEmitter.h
+++ b/include/swift/SILOptimizer/Differentiation/JVPEmitter.h
@@ -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 {
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/LinearMapInfo.h b/include/swift/SILOptimizer/Differentiation/LinearMapInfo.h
similarity index 100%
rename from include/swift/SILOptimizer/Utils/Differentiation/LinearMapInfo.h
rename to include/swift/SILOptimizer/Differentiation/LinearMapInfo.h
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/PullbackEmitter.h b/include/swift/SILOptimizer/Differentiation/PullbackEmitter.h
similarity index 98%
rename from include/swift/SILOptimizer/Utils/Differentiation/PullbackEmitter.h
rename to include/swift/SILOptimizer/Differentiation/PullbackEmitter.h
index 9db8111d0792a..4a6152bf61c1b 100644
--- a/include/swift/SILOptimizer/Utils/Differentiation/PullbackEmitter.h
+++ b/include/swift/SILOptimizer/Differentiation/PullbackEmitter.h
@@ -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 {
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/Thunk.h b/include/swift/SILOptimizer/Differentiation/Thunk.h
similarity index 100%
rename from include/swift/SILOptimizer/Utils/Differentiation/Thunk.h
rename to include/swift/SILOptimizer/Differentiation/Thunk.h
diff --git a/include/swift/SILOptimizer/Utils/Differentiation/VJPEmitter.h b/include/swift/SILOptimizer/Differentiation/VJPEmitter.h
similarity index 97%
rename from include/swift/SILOptimizer/Utils/Differentiation/VJPEmitter.h
rename to include/swift/SILOptimizer/Differentiation/VJPEmitter.h
index d491021f4655f..d53b7a4532565 100644
--- a/include/swift/SILOptimizer/Utils/Differentiation/VJPEmitter.h
+++ b/include/swift/SILOptimizer/Differentiation/VJPEmitter.h
@@ -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 {
diff --git a/lib/SILOptimizer/Analysis/CMakeLists.txt b/lib/SILOptimizer/Analysis/CMakeLists.txt
index 90c0b0e669495..89ef0cdbc55c6 100644
--- a/lib/SILOptimizer/Analysis/CMakeLists.txt
+++ b/lib/SILOptimizer/Analysis/CMakeLists.txt
@@ -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
diff --git a/lib/SILOptimizer/Analysis/DifferentiableActivityAnalysis.cpp b/lib/SILOptimizer/Analysis/DifferentiableActivityAnalysis.cpp
index e78f968141477..8358319ef16b2 100644
--- a/lib/SILOptimizer/Analysis/DifferentiableActivityAnalysis.cpp
+++ b/lib/SILOptimizer/Analysis/DifferentiableActivityAnalysis.cpp
@@ -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;
diff --git a/lib/SILOptimizer/CMakeLists.txt b/lib/SILOptimizer/CMakeLists.txt
index f05c7b8a22364..544c554d14340 100644
--- a/lib/SILOptimizer/CMakeLists.txt
+++ b/lib/SILOptimizer/CMakeLists.txt
@@ -23,6 +23,7 @@ endmacro()
 
 add_subdirectory(ARC)
 add_subdirectory(Analysis)
+add_subdirectory(Differentiation)
 add_subdirectory(FunctionSignatureTransforms)
 add_subdirectory(IPO)
 add_subdirectory(LoopTransforms)
diff --git a/lib/SILOptimizer/Utils/Differentiation/ADContext.cpp b/lib/SILOptimizer/Differentiation/ADContext.cpp
similarity index 98%
rename from lib/SILOptimizer/Utils/Differentiation/ADContext.cpp
rename to lib/SILOptimizer/Differentiation/ADContext.cpp
index cc1b616ecd947..5e621f7e25193 100644
--- a/lib/SILOptimizer/Utils/Differentiation/ADContext.cpp
+++ b/lib/SILOptimizer/Differentiation/ADContext.cpp
@@ -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"
 
diff --git a/lib/SILOptimizer/Utils/Differentiation/CMakeLists.txt b/lib/SILOptimizer/Differentiation/CMakeLists.txt
similarity index 100%
rename from lib/SILOptimizer/Utils/Differentiation/CMakeLists.txt
rename to lib/SILOptimizer/Differentiation/CMakeLists.txt
diff --git a/lib/SILOptimizer/Utils/Differentiation/Common.cpp b/lib/SILOptimizer/Differentiation/Common.cpp
similarity index 99%
rename from lib/SILOptimizer/Utils/Differentiation/Common.cpp
rename to lib/SILOptimizer/Differentiation/Common.cpp
index 6fb0927e41002..3a04c45d46e48 100644
--- a/lib/SILOptimizer/Utils/Differentiation/Common.cpp
+++ b/lib/SILOptimizer/Differentiation/Common.cpp
@@ -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 {
diff --git a/lib/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.cpp b/lib/SILOptimizer/Differentiation/DifferentiationInvoker.cpp
similarity index 97%
rename from lib/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.cpp
rename to lib/SILOptimizer/Differentiation/DifferentiationInvoker.cpp
index 39233398cb03b..133980174900d 100644
--- a/lib/SILOptimizer/Utils/Differentiation/DifferentiationInvoker.cpp
+++ b/lib/SILOptimizer/Differentiation/DifferentiationInvoker.cpp
@@ -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"
diff --git a/lib/SILOptimizer/Utils/Differentiation/JVPEmitter.cpp b/lib/SILOptimizer/Differentiation/JVPEmitter.cpp
similarity index 99%
rename from lib/SILOptimizer/Utils/Differentiation/JVPEmitter.cpp
rename to lib/SILOptimizer/Differentiation/JVPEmitter.cpp
index ed2a46887b023..4f1c422825a63 100644
--- a/lib/SILOptimizer/Utils/Differentiation/JVPEmitter.cpp
+++ b/lib/SILOptimizer/Differentiation/JVPEmitter.cpp
@@ -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 {
diff --git a/lib/SILOptimizer/Utils/Differentiation/LinearMapInfo.cpp b/lib/SILOptimizer/Differentiation/LinearMapInfo.cpp
similarity index 99%
rename from lib/SILOptimizer/Utils/Differentiation/LinearMapInfo.cpp
rename to lib/SILOptimizer/Differentiation/LinearMapInfo.cpp
index 053aa3924f69d..ab04400b3d6ba 100644
--- a/lib/SILOptimizer/Utils/Differentiation/LinearMapInfo.cpp
+++ b/lib/SILOptimizer/Differentiation/LinearMapInfo.cpp
@@ -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 {
diff --git a/lib/SILOptimizer/Utils/Differentiation/PullbackEmitter.cpp b/lib/SILOptimizer/Differentiation/PullbackEmitter.cpp
similarity index 99%
rename from lib/SILOptimizer/Utils/Differentiation/PullbackEmitter.cpp
rename to lib/SILOptimizer/Differentiation/PullbackEmitter.cpp
index 01a39773cd8b3..8fa3a47d8c5d4 100644
--- a/lib/SILOptimizer/Utils/Differentiation/PullbackEmitter.cpp
+++ b/lib/SILOptimizer/Differentiation/PullbackEmitter.cpp
@@ -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 {
diff --git a/lib/SILOptimizer/Utils/Differentiation/Thunk.cpp b/lib/SILOptimizer/Differentiation/Thunk.cpp
similarity index 99%
rename from lib/SILOptimizer/Utils/Differentiation/Thunk.cpp
rename to lib/SILOptimizer/Differentiation/Thunk.cpp
index 14cf959f65c4b..8c54c9485f425 100644
--- a/lib/SILOptimizer/Utils/Differentiation/Thunk.cpp
+++ b/lib/SILOptimizer/Differentiation/Thunk.cpp
@@ -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 {
diff --git a/lib/SILOptimizer/Utils/Differentiation/VJPEmitter.cpp b/lib/SILOptimizer/Differentiation/VJPEmitter.cpp
similarity index 99%
rename from lib/SILOptimizer/Utils/Differentiation/VJPEmitter.cpp
rename to lib/SILOptimizer/Differentiation/VJPEmitter.cpp
index ca63b5a2ec7c3..35ceca1af9cec 100644
--- a/lib/SILOptimizer/Utils/Differentiation/VJPEmitter.cpp
+++ b/lib/SILOptimizer/Differentiation/VJPEmitter.cpp
@@ -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 {
diff --git a/lib/SILOptimizer/Mandatory/Differentiation.cpp b/lib/SILOptimizer/Mandatory/Differentiation.cpp
index ff8991e66b07b..b4dd40ad43828 100644
--- a/lib/SILOptimizer/Mandatory/Differentiation.cpp
+++ b/lib/SILOptimizer/Mandatory/Differentiation.cpp
@@ -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"
diff --git a/lib/SILOptimizer/Utils/CMakeLists.txt b/lib/SILOptimizer/Utils/CMakeLists.txt
index ee7fa1d0aa6fb..72587675a5500 100644
--- a/lib/SILOptimizer/Utils/CMakeLists.txt
+++ b/lib/SILOptimizer/Utils/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(Differentiation)
-
 silopt_register_sources(
   BasicBlockOptUtils.cpp
   CFGOptUtils.cpp