[NFC][Comgr] Cleanup of AMDGPUCompiler::unbundle

Author: jmmartinez

amd/comgr/src/comgr-compiler.cpp

@@ -1247,7 +1247,7 @@ amd_comgr_status_t AMDGPUCompiler::unbundle() {
   // Collect bitcode memory buffers from bitcodes, bundles, and archives
   for (auto *Input : InSet->DataObjects) {
 
-    std::string FileExtension;
+    const char *FileExtension;
     amd_comgr_data_kind_t UnbundledDataKind;
     switch (Input->DataKind) {
     case AMD_COMGR_DATA_KIND_BC_BUNDLE:
@@ -1278,36 +1278,33 @@ amd_comgr_status_t AMDGPUCompiler::unbundle() {
       const size_t BufSize = sizeof(char) * 30;
       char *Buf = (char *)malloc(BufSize);
       snprintf(Buf, BufSize, "comgr-bundle-%d.%s", std::rand() % 10000,
-               FileExtension.c_str());
+               FileExtension);
       Input->Name = Buf;
     }
 
     // Write input file system so that OffloadBundler API can process
     // TODO: Switch write to VFS
-    std::string InputFilePath = getFilePath(Input, InputDir).str().str();
+    SmallString<128> InputFilePath = getFilePath(Input, InputDir);
     if (auto Status = outputToFile(Input, InputFilePath)) {
       return Status;
     }
 
     // Bundler input name
-    BundlerConfig.InputFileNames.push_back(InputFilePath);
+    BundlerConfig.InputFileNames.emplace_back(InputFilePath);
 
     // Generate prefix for output files
-    std::string OutputPrefix = std::string(Input->Name);
+    StringRef OutputPrefix = Input->Name;
     size_t Index = OutputPrefix.find_last_of(".");
     OutputPrefix = OutputPrefix.substr(0, Index);
 
     // Bundler target and output names
-    for (auto Entry : ActionInfo->BundleEntryIDs) {
-      BundlerConfig.TargetNames.push_back(Entry);
+    for (StringRef Entry : ActionInfo->BundleEntryIDs) {
+      BundlerConfig.TargetNames.emplace_back(Entry);
 
-      // Add an output file for each target
-      std::string OutputFileName =
-          OutputPrefix + '-' + Entry + "." + FileExtension;
-
-      // TODO: Switch this to LLVM path APIs
-      std::string OutputFilePath = OutputDir.str().str() + "/" + OutputFileName;
-      BundlerConfig.OutputFileNames.push_back(OutputFilePath);
+      SmallString<128> OutputFilePath = OutputDir;
+      sys::path::append(OutputFilePath,
+                        OutputPrefix + "-" + Entry + "." + FileExtension);
+      BundlerConfig.OutputFileNames.emplace_back(OutputFilePath);
     }
 
     OffloadBundler Bundler(BundlerConfig);
@@ -1318,8 +1315,10 @@ amd_comgr_status_t AMDGPUCompiler::unbundle() {
            << "\t  Unbundled Files Extension: ." << FileExtension << "\n"
            << "\t  Bundle Entry ID: " << BundlerConfig.TargetNames[0] << "\n"
            << "\t   Input Filename: " << BundlerConfig.InputFileNames[0] << "\n"
-           << "\t  Output Filename: " << BundlerConfig.OutputFileNames[0]
-           << "\n";
+           << "\t  Output Filenames: ";
+      for (StringRef OutputFileName : BundlerConfig.OutputFileNames)
+        LogS << OutputFileName << " ";
+      LogS << "\n";
       LogS.flush();
     }
 
@@ -1347,7 +1346,7 @@ amd_comgr_status_t AMDGPUCompiler::unbundle() {
     }
 
     // Add new bitcodes to OutSetT
-    for (auto OutputFilePath : BundlerConfig.OutputFileNames) {
+    for (StringRef OutputFilePath : BundlerConfig.OutputFileNames) {
 
       amd_comgr_data_t ResultT;
 
@@ -1358,11 +1357,10 @@ amd_comgr_status_t AMDGPUCompiler::unbundle() {
       ScopedDataObjectReleaser SDOR(ResultT);
 
       DataObject *Result = DataObject::convert(ResultT);
-      if (auto Status = inputFromFile(Result, StringRef(OutputFilePath)))
+      if (auto Status = inputFromFile(Result, OutputFilePath))
         return Status;
 
-      StringRef OutputFileName =
-          llvm::sys::path::filename(StringRef(OutputFilePath));
+      StringRef OutputFileName = sys::path::filename(OutputFilePath);
       Result->setName(OutputFileName);
 
       if (auto Status = amd_comgr_data_set_add(OutSetT, ResultT)) {