Actually setup jit targets when compiling packageimages instead of targeting only one

gbaraldi · gbaraldi · commit b23d5e1d7832 · 2024-05-14T14:54:06.000-03:00
diff --git a/src/processor_arm.cpp b/src/processor_arm.cpp
@@ -1634,8 +1634,6 @@ static void ensure_jit_target(bool imaging)
 {
     auto &cmdline = get_cmdline_targets();
     check_cmdline(cmdline, imaging);
-    if (!jit_targets.empty())
-        return;
     for (auto &arg: cmdline) {
         auto data = arg_target_data(arg, jit_targets.empty());
         jit_targets.push_back(std::move(data));
@@ -1854,8 +1852,6 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)
 {
     if (jit_targets.empty())
         jl_error("JIT targets not initialized");
-    if (jit_targets.size() > 1)
-        jl_error("Expected only one JIT target");
     return parse_sysimg(hdl, pkgimg_init_cb);
 }
 
@@ -1873,8 +1869,8 @@ JL_DLLEXPORT jl_value_t* jl_check_pkgimage_clones(char *data)
 std::pair<std::string,llvm::SmallVector<std::string, 0>> jl_get_llvm_target(bool imaging, uint32_t &flags)
 {
     ensure_jit_target(imaging);
-    flags = jit_targets[0].en.flags;
-    return get_llvm_target_vec(jit_targets[0]);
+    flags = jit_targets.front().en.flags;
+    return get_llvm_target_vec(jit_targets.front());
 }
 
 const std::pair<std::string,std::string> &jl_get_llvm_disasm_target(void)
diff --git a/src/processor_fallback.cpp b/src/processor_fallback.cpp
@@ -74,8 +74,6 @@ static void ensure_jit_target(bool imaging)
 {
     auto &cmdline = get_cmdline_targets();
     check_cmdline(cmdline, imaging);
-    if (!jit_targets.empty())
-        return;
     for (auto &arg: cmdline) {
         auto data = arg_target_data(arg, jit_targets.empty());
         jit_targets.push_back(std::move(data));
@@ -126,16 +124,14 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)
 {
     if (jit_targets.empty())
         jl_error("JIT targets not initialized");
-    if (jit_targets.size() > 1)
-        jl_error("Expected only one JIT target");
     return parse_sysimg(hdl, pkgimg_init_cb);
 }
 
 std::pair<std::string,llvm::SmallVector<std::string, 0>> jl_get_llvm_target(bool imaging, uint32_t &flags)
 {
     ensure_jit_target(imaging);
-    flags = jit_targets[0].en.flags;
-    return get_llvm_target_vec(jit_targets[0]);
+    flags = jit_targets.front().en.flags;
+    return get_llvm_target_vec(jit_targets.front());
 }
 
 const std::pair<std::string,std::string> &jl_get_llvm_disasm_target(void)
diff --git a/src/processor_x86.cpp b/src/processor_x86.cpp
@@ -914,8 +914,6 @@ static void ensure_jit_target(bool imaging)
 {
     auto &cmdline = get_cmdline_targets();
     check_cmdline(cmdline, imaging);
-    if (!jit_targets.empty())
-        return;
     for (auto &arg: cmdline) {
         auto data = arg_target_data(arg, jit_targets.empty());
         jit_targets.push_back(std::move(data));
@@ -1084,16 +1082,14 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)
 {
     if (jit_targets.empty())
         jl_error("JIT targets not initialized");
-    if (jit_targets.size() > 1)
-        jl_error("Expected only one JIT target");
     return parse_sysimg(hdl, pkgimg_init_cb);
 }
 
 std::pair<std::string,llvm::SmallVector<std::string, 0>> jl_get_llvm_target(bool imaging, uint32_t &flags)
 {
     ensure_jit_target(imaging);
-    flags = jit_targets[0].en.flags;
-    return get_llvm_target_vec(jit_targets[0]);
+    flags = jit_targets.front().en.flags;
+    return get_llvm_target_vec(jit_targets.front());
 }
 
 const std::pair<std::string,std::string> &jl_get_llvm_disasm_target(void)

Original file line number	Diff line number	Diff line change
`@@ -1634,8 +1634,6 @@ static void ensure_jit_target(bool imaging)`
`1634`	`1634`	`{`
`1635`	`1635`	`auto &cmdline = get_cmdline_targets();`
`1636`	`1636`	`check_cmdline(cmdline, imaging);`
`1637`		`- if (!jit_targets.empty())`
`1638`		`- return;`
`1639`	`1637`	`for (auto &arg: cmdline) {`
`1640`	`1638`	`auto data = arg_target_data(arg, jit_targets.empty());`
`1641`	`1639`	`jit_targets.push_back(std::move(data));`
`@@ -1854,8 +1852,6 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)`
`1854`	`1852`	`{`
`1855`	`1853`	`if (jit_targets.empty())`
`1856`	`1854`	`jl_error("JIT targets not initialized");`
`1857`		`- if (jit_targets.size() > 1)`
`1858`		`- jl_error("Expected only one JIT target");`
`1859`	`1855`	`return parse_sysimg(hdl, pkgimg_init_cb);`
`1860`	`1856`	`}`
`1861`	`1857`
`@@ -1873,8 +1869,8 @@ JL_DLLEXPORT jl_value_t* jl_check_pkgimage_clones(char *data)`
`1873`	`1869`	`std::pair<std::string,llvm::SmallVector<std::string, 0>> jl_get_llvm_target(bool imaging, uint32_t &flags)`
`1874`	`1870`	`{`
`1875`	`1871`	`ensure_jit_target(imaging);`
`1876`		`- flags = jit_targets[0].en.flags;`
`1877`		`- return get_llvm_target_vec(jit_targets[0]);`
	`1872`	`+ flags = jit_targets.front().en.flags;`
	`1873`	`+ return get_llvm_target_vec(jit_targets.front());`
`1878`	`1874`	`}`
`1879`	`1875`
`1880`	`1876`	`const std::pair<std::string,std::string> &jl_get_llvm_disasm_target(void)`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,6 @@ static void ensure_jit_target(bool imaging)`
`74`	`74`	`{`
`75`	`75`	`auto &cmdline = get_cmdline_targets();`
`76`	`76`	`check_cmdline(cmdline, imaging);`
`77`		`- if (!jit_targets.empty())`
`78`		`- return;`
`79`	`77`	`for (auto &arg: cmdline) {`
`80`	`78`	`auto data = arg_target_data(arg, jit_targets.empty());`
`81`	`79`	`jit_targets.push_back(std::move(data));`
`@@ -126,16 +124,14 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)`
`126`	`124`	`{`
`127`	`125`	`if (jit_targets.empty())`
`128`	`126`	`jl_error("JIT targets not initialized");`
`129`		`- if (jit_targets.size() > 1)`
`130`		`- jl_error("Expected only one JIT target");`
`131`	`127`	`return parse_sysimg(hdl, pkgimg_init_cb);`
`132`	`128`	`}`
`133`	`129`
`134`	`130`	`std::pair<std::string,llvm::SmallVector<std::string, 0>> jl_get_llvm_target(bool imaging, uint32_t &flags)`
`135`	`131`	`{`
`136`	`132`	`ensure_jit_target(imaging);`
`137`		`- flags = jit_targets[0].en.flags;`
`138`		`- return get_llvm_target_vec(jit_targets[0]);`
	`133`	`+ flags = jit_targets.front().en.flags;`
	`134`	`+ return get_llvm_target_vec(jit_targets.front());`
`139`	`135`	`}`
`140`	`136`
`141`	`137`	`const std::pair<std::string,std::string> &jl_get_llvm_disasm_target(void)`
Original file line number	Diff line number	Diff line change
`@@ -914,8 +914,6 @@ static void ensure_jit_target(bool imaging)`
`914`	`914`	`{`
`915`	`915`	`auto &cmdline = get_cmdline_targets();`
`916`	`916`	`check_cmdline(cmdline, imaging);`
`917`		`- if (!jit_targets.empty())`
`918`		`- return;`
`919`	`917`	`for (auto &arg: cmdline) {`
`920`	`918`	`auto data = arg_target_data(arg, jit_targets.empty());`
`921`	`919`	`jit_targets.push_back(std::move(data));`
`@@ -1084,16 +1082,14 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)`
`1084`	`1082`	`{`
`1085`	`1083`	`if (jit_targets.empty())`
`1086`	`1084`	`jl_error("JIT targets not initialized");`
`1087`		`- if (jit_targets.size() > 1)`
`1088`		`- jl_error("Expected only one JIT target");`
`1089`	`1085`	`return parse_sysimg(hdl, pkgimg_init_cb);`
`1090`	`1086`	`}`
`1091`	`1087`
`1092`	`1088`	`std::pair<std::string,llvm::SmallVector<std::string, 0>> jl_get_llvm_target(bool imaging, uint32_t &flags)`
`1093`	`1089`	`{`
`1094`	`1090`	`ensure_jit_target(imaging);`
`1095`		`- flags = jit_targets[0].en.flags;`
`1096`		`- return get_llvm_target_vec(jit_targets[0]);`
	`1091`	`+ flags = jit_targets.front().en.flags;`
	`1092`	`+ return get_llvm_target_vec(jit_targets.front());`
`1097`	`1093`	`}`
`1098`	`1094`
`1099`	`1095`	`const std::pair<std::string,std::string> &jl_get_llvm_disasm_target(void)`