@@ -88,6 +88,10 @@ static cl::opt<bool> OutputAssembly{"S",
8888 cl::desc (" Write output as LLVM assembly"
8989 cl::Hidden, cl::cat (PostLinkCat)};
9090
91+ static cl::opt<bool > SplitEsimd{" split-esimd"
92+ cl::desc (" Split SYCL and ESIMD kernels"
93+ cl::cat (PostLinkCat)};
94+
9195enum IRSplitMode {
9296 SPLIT_PER_TU, // one module per translation unit
9397 SPLIT_PER_KERNEL, // one module per kernel
@@ -446,18 +450,16 @@ splitModule(Module &M,
446450 }
447451}
448452
449- static std::string makeResultFileName (Twine Ext, int I, bool IsEsimd ) {
453+ static std::string makeResultFileName (Twine Ext, int I, StringRef Suffix ) {
450454 const StringRef Dir0 = OutputDir.getNumOccurrences () > 0
451455 ? OutputDir
452456 : sys::path::parent_path (OutputFilename);
453457 const StringRef Sep = sys::path::get_separator ();
454458 std::string Dir = Dir0.str ();
455459 if (!Dir0.empty () && !Dir0.endswith (Sep))
456460 Dir += Sep.str ();
457- std::string RetStr = Dir + sys::path::stem (OutputFilename).str () + " _"
458- if (IsEsimd)
459- RetStr += " esimd_"
460- return RetStr + std::to_string (I) + Ext.str ();
461+ return Dir + sys::path::stem (OutputFilename).str () + " _" str () +
462+ std::to_string (I) + Ext.str ();
461463}
462464
463465static void saveModule (Module &M, StringRef OutFilename) {
@@ -479,13 +481,13 @@ static void saveModule(Module &M, StringRef OutFilename) {
479481// Saves file list if user specified corresponding filename.
480482static string_vector
481483saveResultModules (std::vector<std::unique_ptr<Module>> &ResModules,
482- bool IsEsimd ) {
484+ StringRef Suffix ) {
483485 string_vector Res;
484486
485487 for (size_t I = 0 ; I < ResModules.size (); ++I) {
486488 std::error_code EC;
487489 StringRef FileExt = (OutputAssembly) ? " .ll" " .bc"
488- std::string CurOutFileName = makeResultFileName (FileExt, I, IsEsimd );
490+ std::string CurOutFileName = makeResultFileName (FileExt, I, Suffix );
489491 saveModule (*ResModules[I].get (), CurOutFileName);
490492 Res.emplace_back (std::move (CurOutFileName));
491493 }
@@ -586,7 +588,7 @@ static string_vector saveDeviceImageProperty(
586588 }
587589 std::error_code EC;
588590 std::string SCFile =
589- makeResultFileName (" .prop" IsEsimdKernel );
591+ makeResultFileName (" .prop" IsEsimdKernel ? " esimd_ " : " "
590592 raw_fd_ostream SCOut (SCFile, EC);
591593 PropSet.write (SCOut);
592594 Res.emplace_back (std::move (SCFile));
@@ -598,12 +600,12 @@ static string_vector saveDeviceImageProperty(
598600// Saves specified collection of symbols lists to files.
599601// Saves file list if user specified corresponding filename.
600602static string_vector saveResultSymbolsLists (string_vector &ResSymbolsLists,
601- bool IsEsimd ) {
603+ StringRef Suffix ) {
602604 string_vector Res;
603605
604606 std::string TxtFilesList;
605607 for (size_t I = 0 ; I < ResSymbolsLists.size (); ++I) {
606- std::string CurOutFileName = makeResultFileName (" .sym" IsEsimd );
608+ std::string CurOutFileName = makeResultFileName (" .sym" Suffix );
607609 writeToFile (CurOutFileName, ResSymbolsLists[I]);
608610 Res.emplace_back (std::move (CurOutFileName));
609611 }
@@ -682,7 +684,7 @@ static TableFiles processOneModule(std::unique_ptr<Module> M, bool IsEsimd,
682684 // reuse input module if there were no spec constants and no splitting
683685 string_vector Files =
684686 SpecConstsMet || (ResultModules.size () > 1 ) || SyclAndEsimdKernels
685- ? saveResultModules (ResultModules, IsEsimd)
687+ ? saveResultModules (ResultModules, IsEsimd ? " esimd_ " : " "
686688 : string_vector{InputFilename};
687689 // "Code" column is always output
688690 std::copy (Files.begin (), Files.end (),
@@ -696,7 +698,6 @@ static TableFiles processOneModule(std::unique_ptr<Module> M, bool IsEsimd,
696698 string_vector Files = saveDeviceImageProperty (ResultModules, ImgPSInfo);
697699 std::copy (Files.begin (), Files.end (),
698700 std::back_inserter (TblFiles[COL_PROPS]));
699-
700701 }
701702 if (DoSymGen) {
702703 // extract symbols per each module
@@ -706,7 +707,8 @@ static TableFiles processOneModule(std::unique_ptr<Module> M, bool IsEsimd,
706707 assert (ResultModules.size () == 1 );
707708 ResultSymbolsLists.push_back (" "
708709 }
709- string_vector Files = saveResultSymbolsLists (ResultSymbolsLists, IsEsimd);
710+ string_vector Files =
711+ saveResultSymbolsLists (ResultSymbolsLists, IsEsimd ? " esimd_" " "
710712 std::copy (Files.begin (), Files.end (),
711713 std::back_inserter (TblFiles[COL_SYM]));
712714 }
@@ -750,6 +752,36 @@ static ModulePair splitSyclEsimd(std::unique_ptr<Module> M) {
750752 std::move (ResultModules[1 ]));
751753}
752754
755+ static TableFiles processInputModule (std::unique_ptr<Module> M) {
756+ if (!SplitEsimd)
757+ return processOneModule (std::move (M), false , false );
758+
759+ std::unique_ptr<Module> SyclModule;
760+ std::unique_ptr<Module> EsimdModule;
761+ std::tie (SyclModule, EsimdModule) = splitSyclEsimd (std::move (M));
762+
763+ // Do we have both Sycl and Esimd kernels?
764+ bool SyclAndEsimdKernels = SyclModule && EsimdModule;
765+
766+ TableFiles SyclTblFiles =
767+ processOneModule (std::move (SyclModule), false , SyclAndEsimdKernels);
768+ TableFiles EsimdTblFiles =
769+ processOneModule (std::move (EsimdModule), true , SyclAndEsimdKernels);
770+
771+ // Merge the two resulting file maps
772+ TableFiles MergedTblFiles;
773+ for (auto &ColumnStr : {COL_CODE, COL_PROPS, COL_SYM}) {
774+ auto &SyclFiles = SyclTblFiles[ColumnStr];
775+ auto &EsimdFiles = EsimdTblFiles[ColumnStr];
776+ auto &MergedFiles = MergedTblFiles[ColumnStr];
777+ std::copy (SyclFiles.begin (), SyclFiles.end (),
778+ std::back_inserter (MergedFiles));
779+ std::copy (EsimdFiles.begin (), EsimdFiles.end (),
780+ std::back_inserter (MergedFiles));
781+ }
782+ return MergedTblFiles;
783+ }
784+
753785int main (int argc, char **argv) {
754786 InitLLVM X{argc, argv};
755787
@@ -761,13 +793,19 @@ int main(int argc, char **argv) {
761793 " This is a collection of utilities run on device code's LLVM IR before\n "
762794 " handing off to back-end for further compilation or emitting SPIRV.\n "
763795 " The utilities are:\n "
796+ " - SYCL and ESIMD kernels can be split into separate modules with\n "
797+ " '-split-esimd' option. The option has no effect when there is only\n "
798+ " one type of kernels in the input module.\n "
764799 " - Module splitter to split a big input module into smaller ones.\n "
765800 " Groups kernels using function attribute 'sycl-module-id', i.e.\n "
766801 " kernels with the same values of the 'sycl-module-id' attribute will\n "
767802 " be put into the same module. If -split=kernel option is specified,\n "
768803 " one module per kernel will be emitted.\n "
769804 " '-split=auto' mode automatically selects the best way of splitting\n "
770805 " kernels into modules based on some heuristic.\n "
806+ " The '-split' option is compatible with '-split-esimd'. In this case,\n "
807+ " first input module will be split into SYCL and ESIMD modules. Then\n "
808+ " both modules will be further split according to the '-split' option.\n "
771809 " - If -symbols options is also specified, then for each produced module\n "
772810 " a text file containing names of all spir kernels in it is generated.\n "
773811 " - Specialization constant intrinsic transformer. Replaces symbolic\n "
@@ -792,10 +830,11 @@ int main(int argc, char **argv) {
792830 " than 'auto'.\n "
793831
794832 bool DoSplit = SplitMode.getNumOccurrences () > 0 ;
833+ bool DoSplitEsimd = SplitEsimd.getNumOccurrences () > 0 ;
795834 bool DoSpecConst = SpecConstLower.getNumOccurrences () > 0 ;
796835 bool DoParamInfo = EmitKernelParamInfo.getNumOccurrences () > 0 ;
797836
798- if (!DoSplit && !DoSpecConst && !DoSymGen && !DoParamInfo) {
837+ if (!DoSplit && !DoSpecConst && !DoSymGen && !DoParamInfo && !DoSplitEsimd ) {
799838 errs () << " no actions specified; try --help for usage info\n "
800839 return 1 ;
801840 }
@@ -804,6 +843,11 @@ int main(int argc, char **argv) {
804843 << " can't be used with -" ArgStr << " \n "
805844 return 1 ;
806845 }
846+ if (IROutputOnly && DoSplitEsimd) {
847+ errs () << " error: -" ArgStr << " can't be used with -"
848+ << IROutputOnly.ArgStr << " \n "
849+ return 1 ;
850+ }
807851 if (IROutputOnly && DoSymGen) {
808852 errs () << " error: -" ArgStr << " can't be used with -"
809853 << IROutputOnly.ArgStr << " \n "
@@ -840,58 +884,22 @@ int main(int argc, char **argv) {
840884 if (OutputFilename.getNumOccurrences () == 0 )
841885 OutputFilename = (Twine (sys::path::stem (InputFilename)) + " .files" str ();
842886
843- std::unique_ptr<Module> SyclModule;
844- std::unique_ptr<Module> EsimdModule;
845- std::tie (SyclModule, EsimdModule) = splitSyclEsimd (std::move (M));
846-
847- // Do we have both Sycl and Esimd kernels?
848- bool SyclAndEsimdKernels = SyclModule && EsimdModule;
849-
850- TableFiles SyclTblFiles =
851- processOneModule (std::move (SyclModule), false , SyclAndEsimdKernels);
887+ TableFiles TblFiles = processInputModule (std::move (M));
852888
853- // TODO: Currently -ir-output-only option doesn't work when there is a mix
854- // of SYCL and ESIMD kernels. The option requires a single LLVM IR output
855- // file, which we cannot provide since SYCL and ESIMD kernels should always
856- // be split.
857- // Today, -ir-output-only is an FPGA use case, while ESIMD kernels only appear
858- // in programs that run on a GPU, so they are orthogonal. But once there
859- // would be a use case for -ir-output-only on a module that has SYCL and ESIMD
860- // code, we need to address it.
889+ // Input module was processed and a single output file was requested.
861890 if (IROutputOnly)
862891 return 0 ;
863892
864- TableFiles EsimdTblFiles =
865- processOneModule (std::move (EsimdModule), true , SyclAndEsimdKernels);
866-
893+ // Populate and emit the resulting table
867894 util::SimpleTable Table;
895+ for (auto &ColumnStr : {COL_CODE, COL_PROPS, COL_SYM})
896+ if (!TblFiles[ColumnStr].empty ())
897+ CHECK_AND_EXIT (Table.addColumn (ColumnStr, TblFiles[ColumnStr]));
868898
869- auto addTableColumn = [&Table, &SyclTblFiles,
870- &EsimdTblFiles](std::string Str) {
871- auto &SyclFiles = SyclTblFiles[Str];
872- auto &EsimdFiles = EsimdTblFiles[Str];
873- string_vector Files (SyclFiles);
874- std::copy (EsimdFiles.begin (), EsimdFiles.end (), std::back_inserter (Files));
875- if (Files.empty ())
876- return 0 ;
877- Error Err = Table.addColumn (Str, Files);
878- CHECK_AND_EXIT (Err);
879- return 0 ;
880- };
881-
882- int Res;
883- if ((Res = addTableColumn (COL_CODE)) != 0 )
884- return Res;
885- if ((Res = addTableColumn (COL_PROPS)) != 0 )
886- return Res;
887- if ((Res = addTableColumn (COL_SYM)) != 0 )
888- return Res;
899+ std::error_code EC;
900+ raw_fd_ostream Out{OutputFilename, EC, sys::fs::OF_None};
901+ checkError (EC, " error opening file '" " '"
902+ Table.write (Out);
889903
890- {
891- std::error_code EC;
892- raw_fd_ostream Out{OutputFilename, EC, sys::fs::OF_None};
893- checkError (EC, " error opening file '" " '"
894- Table.write (Out);
895- }
896904 return 0 ;
897905}
0 commit comments