Remove dtlto-translate-options.ll and address some small mistakes

dtlto-translate-options.ll checks that the DTLTO code that creates Clang
command lines generates the expected options and that those options are
accepted by clang. I wrote it to use llvm-lto and opt so it could be
part of this commit before the clang and lld patches go in. However, I
think it is a nice principle to only use external tools in
cross-project-tests. I have removed the test from this PR with the
intention of adding it back later. Additionally if I can use the idea
of storing the Clang `-c` step options and applying them to the remote
backend compilations then this test will be rewritten to test that
behaviour instead.

Also address some minor mistakes that were identified by Teresa.

Author: bd1976bris

cross-project-tests/CMakeLists.txt

@@ -19,13 +19,11 @@ set(CROSS_PROJECT_TEST_DEPS
   FileCheck
   check-gdb-llvm-support
   count
-  llvm-config
   llvm-dwarfdump
-  llvm-lto2
+  llvm-config
   llvm-objdump
-  not
-  opt
   split-file
+  not
   )
 
 if ("clang" IN_LIST LLVM_ENABLE_PROJECTS)
@@ -96,13 +94,6 @@ add_lit_testsuite(check-cross-amdgpu "Running AMDGPU cross-project tests"
   DEPENDS clang
   )
 
-# DTLTO tests.
-add_lit_testsuite(check-cross-dtlto "Running DTLTO cross-project tests"
-  ${CMAKE_CURRENT_BINARY_DIR}/dtlto
-  EXCLUDE_FROM_CHECK_ALL
-  DEPENDS ${CROSS_PROJECT_TEST_DEPS}
-  )
-
 # Add check-cross-project-* targets.
 add_lit_testsuites(CROSS_PROJECT ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS ${CROSS_PROJECT_TEST_DEPS}

cross-project-tests/dtlto/README.md

@@ -19,7 +19,7 @@
 config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
 
 # suffixes: A list of file extensions to treat as test files.
-config.suffixes = [".c", ".cl", ".cpp", ".m", ".ll"]
+config.suffixes = [".c", ".cl", ".cpp", ".m"]
 
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent
@@ -96,9 +96,6 @@ def get_required_attr(config, attr_name):
 if lldb_path is not None:
     config.available_features.add("lldb")
 
-for tool in ["llvm-lto2", "opt"]:
-    if llvm_config.use_llvm_tool(tool):
-        config.available_features.add(tool)
 
 def configure_dexter_substitutions():
     """Configure substitutions for host platform and return list of dependencies"""

cross-project-tests/dtlto/dtlto-translate-options.ll

@@ -112,15 +112,15 @@ include the stem of the bitcode module, or the output file that the LTO
 invocation is contributing to, to aid the user in identifying them:
 
 - **JSON Job Description File**:
-    - Format:  `dtlto.<UID>.dist-file.json`
+    - Format:  `dtlto.<PID>.dist-file.json`
     - Example: `dtlto.77380.dist-file.json` (for output file `dtlto.elf`).
 
 - **Object Files From Backend Compilations**:
-    - Format:  `<Module ID stem>.<Task>.<UID>.native.o`
+    - Format:  `<Module ID stem>.<Task>.<PID>.native.o`
     - Example: `my.1.77380.native.o` (for bitcode module `my.o`).
 
 - **Summary Index Shard Files**:
-    - Format:  `<Module ID stem>.<Task>.<UID>.native.o.thinlto.bc`
+    - Format:  `<Module ID stem>.<Task>.<PID>.native.o.thinlto.bc`
     - Example: `my.1.77380.native.o.thinlto.bc` (for bitcode module `my.o`).
 
 Temporary files are removed, by default, after the backend compilations complete.

cross-project-tests/dtlto/lit.local.cfg

@@ -246,8 +246,8 @@ class ThinBackendProc {
   Error emitFiles(const FunctionImporter::ImportMapTy &ImportList,
                   StringRef ModulePath, const std::string &NewModulePath) const;
 
-  // Write sharded indices to SummaryPath, (optionally) imports
-  // IndexPath, and (optionally) record imports in ImportsFiles.
+  // Write sharded indices to SummaryPath, (optionally) imports to disk, and
+  // (optionally) record imports in ImportsFiles.
   Error emitFiles(const FunctionImporter::ImportMapTy &ImportList,
                   StringRef ModulePath, StringRef SummaryPath,
                   const std::string &NewModulePath,

cross-project-tests/lit.cfg.py

@@ -99,10 +99,9 @@ cl::list<std::string> AdditionalThinLTODistributorArgs(
     "thinlto-distributor-arg",
     cl::desc("Additional arguments to pass to the ThinLTO distributor"));
 
-cl::opt<std::string>
-    ThinLTORemoteCompiler("thinlto-remote-compiler",
-                          cl::desc("Additional arguments to pass to the "
-                                   "ThinLTO remote optimization tool"));
+cl::opt<std::string> ThinLTORemoteCompiler(
+    "thinlto-remote-compiler",
+    cl::desc("Compiler to invoke for the ThinLTO backend compilations"));
 
 cl::list<std::string>
     ThinLTORemoteCompilerArgs("thinlto-remote-compiler-arg",
@@ -2282,9 +2281,6 @@ class OutOfProcessThinBackend : public CGThinBackend {
     assert(ModuleToDefinedGVSummaries.count(ModulePath));
     BackendThreadPool.async(
         [=](Job &J, const FunctionImporter::ImportMapTy &ImportList) {
-          if (LLVM_ENABLE_THREADS && Conf.TimeTraceEnabled)
-            timeTraceProfilerInitialize(Conf.TimeTraceGranularity,
-                                        "thin backend");
           if (auto E = emitFiles(ImportList, J.ModuleID, J.SummaryIndexPath,
                                  J.ModuleID.str(), J.ImportFiles)) {
             std::unique_lock<std::mutex> L(ErrMu);
@@ -2293,8 +2289,6 @@ class OutOfProcessThinBackend : public CGThinBackend {
             else
               Err = std::move(E);
           }
-          if (LLVM_ENABLE_THREADS && Conf.TimeTraceEnabled)
-            timeTraceProfilerFinishThread();
         },
         std::ref(J), std::ref(ImportList));
 

llvm/docs/DTLTO.rst

@@ -38,22 +38,18 @@ INPUTS-NEXT: ]
 # This check ensures that we have failed for the expected reason.
 ERR: failed: DTLTO backend compilation: cannot open native object file:
 
-# Check that imports files have not been created.
-RUN: ls | FileCheck %s --check-prefix=NOINDEXFILES
-NOINDEXFILES-NOT: imports
-
-# Check that imports files are not created with -save-temps.
+# Check that imports files are not created even if -save-temps is active.
 RUN: not %{command} -save-temps 2>&1 \ 
 RUN:   | FileCheck %s --check-prefixes=ERR
-RUN: ls | FileCheck %s --check-prefix=NOINDEXFILES
-NOINDEXFILES-NOT: imports
+RUN: ls | FileCheck %s --check-prefix=NOIMPORTFILES
+NOIMPORTFILES-NOT: imports
 
 # Check that imports files are created with -thinlto-emit-imports.
 RUN: not %{command} -thinlto-emit-imports 2>&1 \ 
 RUN:   | FileCheck %s --check-prefixes=ERR
-RUN: ls | FileCheck %s --check-prefix=INDEXFILES
-INDEXFILES: 0.bc.imports
-INDEXFILES: 1.bc.imports
+RUN: ls | FileCheck %s --check-prefix=IMPORTFILES
+IMPORTFILES: 0.bc.imports
+IMPORTFILES: 1.bc.imports
 
 #--- 0.ll
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"