Address review comments

 - Update clang-cl based test to use Windows triple
 - Update some comments

Author: mdtoguchi

clang/lib/Driver/Action.cpp

@@ -88,7 +88,9 @@ void Action::propagateDeviceOffloadInfo(OffloadKind OKind, const char *OArch,
   // Deps job uses the host kinds.
   if (Kind == OffloadDepsJobClass)
     return;
-  // Packaging actions can use host kinds for preprocessing.
+  // Packaging actions can use host kinds for preprocessing.  When packaging
+  // preprocessed files, these packaged files will contain both host and device
+  // files, where the host side does not have any device info to propagate.
   bool hasPreprocessJob =
       std::any_of(Inputs.begin(), Inputs.end(), [](const Action *A) {
         return A->getKind() == PreprocessJobClass;

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10391,7 +10391,7 @@ void OffloadPackager::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs, Inputs, Output));
 }
 
-// Use the clang-offload-packager to extract binaries from an packaged
+// Use the clang-offload-packager to extract binaries from a packaged
 // binary.  This currently only supports single input/single output.
 void OffloadPackagerExtract::ConstructJob(Compilation &C, const JobAction &JA,
                                           const InputInfo &Output,

clang/test/Driver/sycl-preprocess.cpp

@@ -17,17 +17,17 @@
 
 /// When generating preprocessed files, verify the compilation phases.
 // RUN: %clangxx --target=x86_64-unknown-linux-gnu --offload-new-driver -fsycl -E %s -o %t.ii -ccc-print-phases 2>&1 \
-// RUN: | FileCheck %s -check-prefix PREPROC_PHASES
-// RUN: %clang_cl --target=x86_64-unknown-linux-gnu --offload-new-driver -fsycl -P %s -Fi%t.ii -ccc-print-phases 2>&1 \
-// RUN: | FileCheck %s -check-prefix PREPROC_PHASES
+// RUN: | FileCheck %s -check-prefix PREPROC_PHASES -DTARGET=x86_64-unknown-linux-gnu
+// RUN: %clang_cl --target=x86_64-pc-windows-msvc --offload-new-driver -fsycl -P %s -Fi%t.ii -ccc-print-phases 2>&1 \
+// RUN: | FileCheck %s -check-prefix PREPROC_PHASES -DTARGET=x86_64-pc-windows-msvc
 // PREPROC_PHASES: 0: input, "[[INPUT:.+\.cpp]]", c++, (host-sycl)
 // PREPROC_PHASES: 1: preprocessor, {0}, c++-cpp-output, (host-sycl)
 // PREPROC_PHASES: 2: input, "[[INPUT]]", c++, (device-sycl)
 // PREPROC_PHASES: 3: preprocessor, {2}, c++-cpp-output, (device-sycl)
 // PREPROC_PHASES: 4: compiler, {3}, none, (device-sycl)
 // PREPROC_PHASES: 5: offload, "device-sycl (spir64-unknown-unknown)" {3}, c++-cpp-output
 // PREPROC_PHASES: 6: clang-offload-packager, {5, 1}, c++-cpp-output
-// PREPROC_PHASES: 7: offload, "host-sycl (x86_64-unknown-linux-gnu)" {1}, "device-sycl (spir64-unknown-unknown)" {3}, "device-sycl (spir64-unknown-unknown)" {4}, " (x86_64-unknown-linux-gnu)" {6}, c++-cpp-output
+// PREPROC_PHASES: 7: offload, "host-sycl ([[TARGET]])" {1}, "device-sycl (spir64-unknown-unknown)" {3}, "device-sycl (spir64-unknown-unknown)" {4}, " ([[TARGET]])" {6}, c++-cpp-output
 
 /// When generating preprocessed files, verify the tools called and the expected
 /// output file name.