shithub: dav1d

diff: cannot open b/src/ppc//null: file does not exist: 'b/src/ppc//null'

--- a/meson.build

+++ b/meson.build

@@ -64,7 +64,8 @@

 is_asm_enabled = (get_option('build_asm') == true and

     (host_machine.cpu_family().startswith('x86') or

      host_machine.cpu_family() == 'aarch64'      or

-     host_machine.cpu_family().startswith('arm')))

+     host_machine.cpu_family().startswith('arm') or

+     host_machine.cpu() == 'ppc64le'))

 cdata.set10('HAVE_ASM', is_asm_enabled)

 if is_asm_enabled and get_option('b_sanitize') == 'memory'

@@ -160,7 +161,8 @@

 endif

 if (host_machine.cpu_family() == 'aarch64' or

-    host_machine.cpu_family().startswith('arm'))

+    host_machine.cpu_family().startswith('arm') or

+    host_machine.cpu() == 'ppc64le')

     if cc.has_function('getauxval', prefix : '#include <sys/auxv.h>', args : test_args)

         cdata.set('HAVE_GETAUXVAL', 1)

     endif

@@ -302,6 +304,8 @@

     cdata_asm.set10('ARCH_X86_32', host_machine.cpu_family() == 'x86')

     cdata_asm.set10('PIC', true)

 endif

+cdata.set10('ARCH_PPC64LE', host_machine.cpu() == 'ppc64le')

 if cc.symbols_have_underscore_prefix()

     cdata.set10('PREFIX', true)

--- a/src/cpu.c

+++ b/src/cpu.c

@@ -39,6 +39,8 @@

     if (!checked) {

 #if (ARCH_AARCH64 || ARCH_ARM) && HAVE_ASM

         flags = dav1d_get_cpu_flags_arm();

+#elif ARCH_PPC64LE && HAVE_ASM

+        flags = dav1d_get_cpu_flags_ppc();

 #elif ARCH_X86 && HAVE_ASM

         flags = dav1d_get_cpu_flags_x86();

 #else

--- a/src/cpu.h

+++ b/src/cpu.h

@@ -36,6 +36,8 @@

 #if ARCH_AARCH64 || ARCH_ARM

 #include "src/arm/cpu.h"

+#elif ARCH_PPC64LE

+#include "src/ppc/cpu.h"

 #elif ARCH_X86

 #include "src/x86/cpu.h"

 #endif

--- a/src/meson.build

+++ b/src/meson.build

@@ -148,6 +148,10 @@

         # Compile the ASM sources with NASM

         libdav1d_nasm_objs = nasm_gen.process(libdav1d_sources_asm)

+    elif host_machine.cpu() == 'ppc64le'

+        libdav1d_sources += files(

+            'ppc/cpu.c',

+        )

     endif

 endif

--- /dev/null

+++ b/src/ppc/cpu.c

@@ -1,0 +1,51 @@

+/*

+ * Copyright © 2019, VideoLAN and dav1d authors

+ * Copyright © 2019, Janne Grunau

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright notice, this

+ *    list of conditions and the following disclaimer.

+ *

+ * 2. Redistributions in binary form must reproduce the above copyright notice,

+ *    this list of conditions and the following disclaimer in the documentation

+ *    and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR

+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+#include "config.h"

+#include "common/attributes.h"

+#include "src/ppc/cpu.h"

+#if (defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO)) && ARCH_PPC64LE

+#include <sys/auxv.h>

+#define HAVE_AUX

+#endif

+COLD unsigned dav1d_get_cpu_flags_ppc(void) {

+    unsigned flags = 0;

+#if defined(HAVE_GETAUXVAL) && ARCH_PPC64LE

+    unsigned long hw_cap = getauxval(AT_HWCAP);

+#elif defined(HAVE_ELF_AUX_INFO) && ARCH_PPC64LE

+    unsigned long hw_cap = 0;

+    elf_aux_info(AT_HWCAP, &hw_cap, sizeof(hw_cap));

+#endif

+#ifdef HAVE_AUX

+    flags |= (hw_cap & PPC_FEATURE_HAS_VSX) ? DAV1D_PPC_CPU_FLAG_VSX : 0;

+#endif

+    return flags;

+}

--- /dev/null

+++ b/src/ppc/cpu.h

@@ -1,0 +1,37 @@

+/*

+ * Copyright © 2019, VideoLAN and dav1d authors

+ * Copyright © 2019, Janne Grunau

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright notice, this

+ *    list of conditions and the following disclaimer.

+ *

+ * 2. Redistributions in binary form must reproduce the above copyright notice,

+ *    this list of conditions and the following disclaimer in the documentation

+ *    and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR

+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+#ifndef DAV1D_SRC_PPC_CPU_H

+#define DAV1D_SRC_PPC_CPU_H

+enum CpuFlags {

+    DAV1D_PPC_CPU_FLAG_VSX = 1 << 0,

+};

+unsigned dav1d_get_cpu_flags_ppc(void);

+#endif /* DAV1D_SRC_PPC_CPU_H */