[Mesa-dev] [radeonsi] Clover broken after new 'nir_serialize'

[Dieter Nützel]

You speedy man!

Yes, tested and works.

Thank you.

Dieter

Am 11.10.2019 00:45, schrieb Marek Olšák:
> It should be fixed now.
> 
> Marek
> 
> On Thu, Oct 10, 2019 at 6:42 PM Marek Olšák <maraeo at gmail.com>
> wrote:
> 
>> Hi,
>> 
>> Sorry for the breakage. I guess it's a recently added file, because
>> I didn't see it in my IDE.
>> 
>> Marek
>> 
>> On Thu, Oct 10, 2019 at 6:27 PM Dieter Nützel
>> <Dieter at nuetzel-hh.de> wrote:
>> 
>>> Hello Marek,
>>> 
>>> forgotten to update Clover?
>>> 
>>> Greetings,
>>> Dieter
>>> 
>>> [1261/1386] Compiling C++ object
>>> 'src/gallium/st...clover/ae4504a@@clnir at sta/nir_invocation.cpp.o'.
>>> FAILED:
>>> 
>> 
> src/gallium/state_trackers/clover/ae4504a@@clnir at sta/nir_invocation.cpp.o
>>> ccache c++ -Isrc/gallium/state_trackers/clover/ae4504a@@clnir at sta
>>> -Isrc/gallium/state_trackers/clover
>>> -I../src/gallium/state_trackers/clover -Iinclude -I../include
>>> -Isrc
>>> -I../src -I../src/gallium/include -Isrc/gallium/auxiliary
>>> -I../src/gallium/auxiliary -Isrc/mesa -I../src/mesa
>>> -Isrc/compiler/nir
>>> -I../src/compiler/nir -fdiagnostics-color=always -DNDEBUG -pipe
>>> -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor
>>> -std=c++14
>>> -O3 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
>>> -D__STDC_LIMIT_MACROS '-DPACKAGE_VERSION="19.3.0-devel"'
>>> 
>> 
> '-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/issues"'
>>> 
>>> -DUSE_ELF_TLS -DHAVE_ST_VDPAU -DENABLE_ST_OMX_BELLAGIO=0
>>> -DENABLE_ST_OMX_TIZONIA=0 -DHAVE_X11_PLATFORM
>>> -DGLX_INDIRECT_RENDERING
>>> -DGLX_DIRECT_RENDERING -DGLX_USE_DRM -DHAVE_DRM_PLATFORM
>>> -DENABLE_SHADER_CACHE -DHAVE___BUILTIN_BSWAP32
>>> -DHAVE___BUILTIN_BSWAP64
>>> -DHAVE___BUILTIN_CLZ -DHAVE___BUILTIN_CLZLL -DHAVE___BUILTIN_CTZ
>>> -DHAVE___BUILTIN_EXPECT -DHAVE___BUILTIN_FFS
>>> -DHAVE___BUILTIN_FFSLL
>>> -DHAVE___BUILTIN_POPCOUNT -DHAVE___BUILTIN_POPCOUNTLL
>>> -DHAVE___BUILTIN_UNREACHABLE -DHAVE_FUNC_ATTRIBUTE_CONST
>>> -DHAVE_FUNC_ATTRIBUTE_FLATTEN -DHAVE_FUNC_ATTRIBUTE_MALLOC
>>> -DHAVE_FUNC_ATTRIBUTE_PURE -DHAVE_FUNC_ATTRIBUTE_UNUSED
>>> -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT
>>> -DHAVE_FUNC_ATTRIBUTE_WEAK
>>> -DHAVE_FUNC_ATTRIBUTE_FORMAT -DHAVE_FUNC_ATTRIBUTE_PACKED
>>> -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL
>>> -DHAVE_FUNC_ATTRIBUTE_VISIBILITY
>>> -DHAVE_FUNC_ATTRIBUTE_ALIAS -DHAVE_FUNC_ATTRIBUTE_NORETURN
>>> -DHAVE_UINT128 -D_GNU_SOURCE -DUSE_SSE41 -DUSE_GCC_ATOMIC_BUILTINS
>>> 
>>> -DUSE_X86_64_ASM -DMAJOR_IN_SYSMACROS -DHAVE_SYS_SYSCTL_H
>>> -DHAVE_LINUX_FUTEX_H -DHAVE_ENDIAN_H -DHAVE_DLFCN_H
>>> -DHAVE_EXECINFO_H
>>> -DHAVE_SYS_SHM_H -DHAVE_CET_H -DHAVE_STRTOF -DHAVE_MKOSTEMP
>>> -DHAVE_POSIX_MEMALIGN -DHAVE_TIMESPEC_GET -DHAVE_MEMFD_CREATE
>>> -DHAVE_RANDOM_R -DHAVE_PROGRAM_INVOCATION_NAME -DHAVE_STRTOD_L
>>> -DHAVE_DLADDR -DHAVE_DL_ITERATE_PHDR -DHAVE_ZLIB -DHAVE_PTHREAD
>>> -DHAVE_PTHREAD_SETAFFINITY -DHAVE_LIBDRM -DLLVM_AVAILABLE
>>> '-DMESA_LLVM_VERSION_STRING="10.0.0"' -DUSE_LIBGLVND=1
>>> -DHAVE_LIBUNWIND
>>> -DHAVE_DRI3 -DHAVE_DRI3_MODIFIERS -DHAVE_LIBSENSORS=1
>>> -Werror=return-type -Werror=format -Wformat-security
>>> -Wno-non-virtual-dtor -Wno-missing-field-initializers
>>> -Wno-format-truncation -fno-math-errno -fno-trapping-math -fPIC
>>> -DHAVE_CLOVER_SPIRV -fvisibility=hidden -MD -MQ
>>> 
>> 
> 'src/gallium/state_trackers/clover/ae4504a@@clnir at sta/nir_invocation.cpp.o'
>>> 
>>> -MF
>>> 
>> 
> 'src/gallium/state_trackers/clover/ae4504a@@clnir at sta/nir_invocation.cpp.o.d'
>>> 
>>> -o
>>> 
>> 
> 'src/gallium/state_trackers/clover/ae4504a@@clnir at sta/nir_invocation.cpp.o'
>>> 
>>> -c ../src/gallium/state_trackers/clover/nir/invocation.cpp
>>> ../src/gallium/state_trackers/clover/nir/invocation.cpp: In
>>> function
>>> ‘clover::module clover::nir::spirv_to_nir(const clover::module&,
>>> const
>>> clover::device&, std::string&)’:
>>> ../src/gallium/state_trackers/clover/nir/invocation.cpp:146:31:
>>> error:
>>> too few arguments to function ‘void nir_serialize(blob*, const
>>> nir_shader*, bool)’
>>> 146 |       nir_serialize(&blob, nir);
>>> |                               ^
>>> In file included from
>>> ../src/gallium/state_trackers/clover/nir/invocation.cpp:34:
>>> ../src/compiler/nir/nir_serialize.h:34:6: note: declared here
>>> 34 | void nir_serialize(struct blob *blob, const nir_shader
>>> *nir,
>>> bool strip);
>>> |      ^~~~~~~~~~~~~
>>> [1270/1386] Compiling C++ object
>>> 'src/gallium/st...over/ae4504a@@clllvm at sta/llvm_invocation.cpp.o'.
>>> ninja: build stopped: subcommand failed.