3:27 a.m.
Hello team,
Building the latest stable osl 1.11.15 failed on all Fedora version except Release 33 due
to error caused by llvm 12.
The following result from Rawhide highlight the cause:
~~~
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:
In member function 'void OSL_v1_11::pvt::LLVM_Util::write_bitcode_file(const char*,
std::string*)':
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:2992:69:
error: 'F_None' is not a member of 'llvm::sys::fs'; did you mean
'OF_None'?
2992 | llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::F_None);
| ^~~~~~
| OF_None
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:
In member function 'bool OSL_v1_11::pvt::LLVM_Util::ptx_compile_group(llvm::Module*,
const string&, std::string&)':
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:3054:13:
error: 'class llvm::TargetOptions' has no member named
'StackAlignmentOverride'
3054 | options.StackAlignmentOverride = 0;
| ^~~~~~~~~~~~~~~~~~~~~~
gmake[2]: *** [src/liboslexec/CMakeFiles/oslexec.dir/build.make:576:
src/liboslexec/CMakeFiles/oslexec.dir/llvm_util.cpp.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
~~~
COPR build is located on
https://copr.fedorainfracloud.org/coprs/luya/blender-egl/build/2680435/
Patch or suggestion welcome.
Thanks in advance,
Luya
7:32 a.m.
On Fri, Sep 3, 2021 at 3:28 AM Luya Tshimbalanga <luya(a)fedoraproject.org>
wrote:
Hello team,
Building the latest stable osl 1.11.15 failed on all Fedora version except
Release 33 due to error caused by llvm 12.
The following result from Rawhide highlight the cause:
~~~
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:
In member function 'void
OSL_v1_11::pvt::LLVM_Util::write_bitcode_file(const char*, std::string*)':
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:2992:69:
error: 'F_None' is not a member of 'llvm::sys::fs'; did you mean
'OF_None'?
2992 | llvm::raw_fd_ostream out (filename, local_error,
llvm::sys::fs::F_None);
|
^~~~~~
|
OF_None
Looks like F_None is (was) a compatibility spelling, I didn't dig but I bet
what it should be changed to is in here somewhere:
https://reviews.llvm.org/D101650
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:
In member function 'bool
OSL_v1_11::pvt::LLVM_Util::ptx_compile_group(llvm::Module*, const string&,
std::string&)':
/builddir/build/BUILD/OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp:3054:13:
error: 'class llvm::TargetOptions' has no member named
'StackAlignmentOverride'
3054 | options.StackAlignmentOverride = 0;
| ^~~~~~~~~~~~~~~~~~~~~~
Looks like this was removed/renamed as well:
https://reviews.llvm.org/D103048
Thanks,
Richard
7:58 a.m.
Testing a patch now, F_None was supposed to be OF_None and it looks like
specifying StackAlignmentOverride is no longer required (I hope) as of LLVM
13.
Thanks,
Richard
8:10 a.m.
You modifications to the Imath patch aren't working for me trying to do a
mock build so here's my untested patch for LLVM 13:
$ cat osl-llvm13.patch
Index: OpenShadingLanguage-Release-1.11.14.2/src/liboslexec/llvm_util.cpp
===================================================================
--- OpenShadingLanguage-Release-1.11.14.2.orig/src/liboslexec/llvm_util.cpp
+++ OpenShadingLanguage-Release-1.11.14.2/src/liboslexec/llvm_util.cpp
@@ -1228,7 +1228,9 @@ LLVM_Util::make_jit_execengine (std::str
options.NoZerosInBSS = false;
options.GuaranteedTailCallOpt = false;
+#if LLVM_VERSION < 13
options.StackAlignmentOverride = 0;
+#endif
options.FunctionSections = true;
options.UseInitArray = false;
options.FloatABIType = llvm::FloatABI::Default;
@@ -2989,7 +2991,7 @@ void
LLVM_Util::write_bitcode_file (const char *filename, std::string *err)
{
std::error_code local_error;
- llvm::raw_fd_ostream out (filename, local_error,
llvm::sys::fs::F_None);
+ llvm::raw_fd_ostream out (filename, local_error,
llvm::sys::fs::OF_None);
if (! out.has_error()) {
llvm::WriteBitcodeToFile (*module(), out);
if (err && local_error)
@@ -3051,7 +3053,9 @@ LLVM_Util::ptx_compile_group (llvm::Modu
options.AllowFPOpFusion =
llvm::FPOpFusion::Fast;
options.NoZerosInBSS = 0;
options.GuaranteedTailCallOpt = 0;
+#if LLVM_VERSION < 13
options.StackAlignmentOverride = 0;
+#endif
options.UseInitArray = 0;
llvm::TargetMachine* target_machine = llvm_target->createTargetMachine(
Thanks,
Richard
9:45 p.m.
Thanks for the patch. With some modifications, osl 1.11.15.0 successfully built for all
releases.
https://copr.fedorainfracloud.org/coprs/luya/blender-egl/build/2681425/
Here is the revised patch:
~~~
diff -Naur OpenShadingLanguage-Release-1.11.15.0.orig/src/liboslexec/llvm_util.cpp
OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp
--- OpenShadingLanguage-Release-1.11.15.0.orig/src/liboslexec/llvm_util.cpp 2021-09-01
00:26:06.000000000 -0700
+++ OpenShadingLanguage-Release-1.11.15.0/src/liboslexec/llvm_util.cpp 2021-09-03
17:14:01.840127907 -0700
@@ -1228,7 +1228,9 @@
options.NoZerosInBSS = false;
options.GuaranteedTailCallOpt = false;
+#if OSL_LLVM_VERSION < 120
options.StackAlignmentOverride = 0;
+#endif
options.FunctionSections = true;
options.UseInitArray = false;
options.FloatABIType = llvm::FloatABI::Default;
@@ -2989,7 +2991,7 @@
LLVM_Util::write_bitcode_file (const char *filename, std::string *err)
{
std::error_code local_error;
- llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::F_None);
+ llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::OF_None);
if (! out.has_error()) {
llvm::WriteBitcodeToFile (*module(), out);
if (err && local_error)
@@ -3051,7 +3053,9 @@
options.AllowFPOpFusion = llvm::FPOpFusion::Fast;
options.NoZerosInBSS = 0;
options.GuaranteedTailCallOpt = 0;
+#if OSL_LLVM_VERSION < 120
options.StackAlignmentOverride = 0;
+#endif
options.UseInitArray = 0;
llvm::TargetMachine* target_machine = llvm_target->createTargetMachine(
~~~
As noticed, changing the LLVM variable for OSL upstream did the trick.
Thanks for help.
Luya Tshimbalanga
Fedora Design Suite maintainer
Fedora Design Team
981
days inactive
982
days old
4 comments
2 participants
participants (2)
-
Luya Tshimbalanga -
Richard Shaw