mirror of
https://github.com/opencv/opencv.git
synced 2024-12-27 03:14:05 +08:00
0de26fd78e
Zlib-ng is zlib replacement with optimizations for "next generation" systems. Its optimization may benifits image library decode and encode speed such as libpng. In our tests, if using zlib-ng and libpng combination on a x86_64 machine with AVX2, the time of `imdecode` amd `imencode` will drop 20% approximately. This patch enables zlib-ng's optimization if `CV_DISABLE_OPTIMIZATION` is OFF. Since Zlib-ng can dispatch intrinsics on the fly, port work is much easier. Related discussion: https://github.com/opencv/opencv/issues/22573
122 lines
4.1 KiB
C
122 lines
4.1 KiB
C
/* chunkset_rvv.c - RVV version of chunkset
|
|
* Copyright (C) 2023 SiFive, Inc. All rights reserved.
|
|
* Contributed by Alex Chiang <alex.chiang@sifive.com>
|
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
*/
|
|
#include <riscv_vector.h>
|
|
#include "zbuild.h"
|
|
|
|
/*
|
|
* RISC-V glibc would enable RVV optimized memcpy at runtime by IFUNC,
|
|
* so we prefer using large size chunk and copy memory as much as possible.
|
|
*/
|
|
#define CHUNK_SIZE 32
|
|
|
|
#define HAVE_CHUNKMEMSET_2
|
|
#define HAVE_CHUNKMEMSET_4
|
|
#define HAVE_CHUNKMEMSET_8
|
|
|
|
#define CHUNK_MEMSET_RVV_IMPL(elen) \
|
|
do { \
|
|
size_t vl, len = CHUNK_SIZE / sizeof(uint##elen##_t); \
|
|
uint##elen##_t val = *(uint##elen##_t*)from; \
|
|
uint##elen##_t* chunk_p = (uint##elen##_t*)chunk; \
|
|
do { \
|
|
vl = __riscv_vsetvl_e##elen##m4(len); \
|
|
vuint##elen##m4_t v_val = __riscv_vmv_v_x_u##elen##m4(val, vl); \
|
|
__riscv_vse##elen##_v_u##elen##m4(chunk_p, v_val, vl); \
|
|
len -= vl; chunk_p += vl; \
|
|
} while (len > 0); \
|
|
} while (0)
|
|
|
|
/* We don't have a 32-byte datatype for RISC-V arch. */
|
|
typedef struct chunk_s {
|
|
uint64_t data[4];
|
|
} chunk_t;
|
|
|
|
static inline void chunkmemset_2(uint8_t *from, chunk_t *chunk) {
|
|
CHUNK_MEMSET_RVV_IMPL(16);
|
|
}
|
|
|
|
static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
|
|
CHUNK_MEMSET_RVV_IMPL(32);
|
|
}
|
|
|
|
static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
|
|
CHUNK_MEMSET_RVV_IMPL(64);
|
|
}
|
|
|
|
static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
|
|
memcpy(chunk->data, (uint8_t *)s, CHUNK_SIZE);
|
|
}
|
|
|
|
static inline void storechunk(uint8_t *out, chunk_t *chunk) {
|
|
memcpy(out, chunk->data, CHUNK_SIZE);
|
|
}
|
|
|
|
#define CHUNKSIZE chunksize_rvv
|
|
#define CHUNKCOPY chunkcopy_rvv
|
|
#define CHUNKUNROLL chunkunroll_rvv
|
|
#define CHUNKMEMSET chunkmemset_rvv
|
|
#define CHUNKMEMSET_SAFE chunkmemset_safe_rvv
|
|
|
|
#define HAVE_CHUNKCOPY
|
|
|
|
/*
|
|
* Assuming that the length is non-zero, and that `from` lags `out` by at least
|
|
* sizeof chunk_t bytes, please see the comments in chunkset_tpl.h.
|
|
*
|
|
* We load/store a single chunk once in the `CHUNKCOPY`.
|
|
* However, RISC-V glibc would enable RVV optimized memcpy at runtime by IFUNC,
|
|
* such that, we prefer copy large memory size once to make good use of the the RVV advance.
|
|
*
|
|
* To be aligned to the other platforms, we didn't modify `CHUNKCOPY` method a lot,
|
|
* but we still copy as much memory as possible for some conditions.
|
|
*
|
|
* case 1: out - from >= len (no overlap)
|
|
* We can use memcpy to copy `len` size once
|
|
* because the memory layout would be the same.
|
|
*
|
|
* case 2: overlap
|
|
* We copy N chunks using memcpy at once, aiming to achieve our goal:
|
|
* to copy as much memory as possible.
|
|
*
|
|
* After using a single memcpy to copy N chunks, we have to use series of
|
|
* loadchunk and storechunk to ensure the result is correct.
|
|
*/
|
|
static inline uint8_t* CHUNKCOPY(uint8_t *out, uint8_t const *from, unsigned len) {
|
|
Assert(len > 0, "chunkcopy should never have a length 0");
|
|
int32_t align = ((len - 1) % sizeof(chunk_t)) + 1;
|
|
memcpy(out, from, sizeof(chunk_t));
|
|
out += align;
|
|
from += align;
|
|
len -= align;
|
|
ptrdiff_t dist = out - from;
|
|
if (dist >= len) {
|
|
memcpy(out, from, len);
|
|
out += len;
|
|
from += len;
|
|
return out;
|
|
}
|
|
if (dist >= sizeof(chunk_t)) {
|
|
dist = (dist / sizeof(chunk_t)) * sizeof(chunk_t);
|
|
memcpy(out, from, dist);
|
|
out += dist;
|
|
from += dist;
|
|
len -= dist;
|
|
}
|
|
while (len > 0) {
|
|
memcpy(out, from, sizeof(chunk_t));
|
|
out += sizeof(chunk_t);
|
|
from += sizeof(chunk_t);
|
|
len -= sizeof(chunk_t);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
#include "chunkset_tpl.h"
|
|
|
|
#define INFLATE_FAST inflate_fast_rvv
|
|
|
|
#include "inffast_tpl.h"
|