libdeflate 0.1.1 → 0.2.0

data/ext/libdeflate/libdeflate/programs/test_checksums.c

@@ -1,135 +0,0 @@
-/*
- * test_checksums.c
- *
- * Verify that libdeflate's Adler-32 and CRC-32 functions produce the same
- * results as their zlib equivalents.
- */
-
-#include <time.h>
-#include <zlib.h>
-
-#include "prog_util.h"
-
-static unsigned int rng_seed;
-
-static void
-assertion_failed(const char *file, int line)
-{
-	fprintf(stderr, "Assertion failed at %s:%d\n", file, line);
-	fprintf(stderr, "RNG seed was %u\n", rng_seed);
-	abort();
-}
-
-#define ASSERT(expr) if (!(expr)) assertion_failed(__FILE__, __LINE__);
-
-typedef u32 (*cksum_fn_t)(u32, const void *, size_t);
-
-static u32
-zlib_adler32(u32 adler, const void *buf, size_t len)
-{
-	return adler32(adler, buf, len);
-}
-
-static u32
-zlib_crc32(u32 crc, const void *buf, size_t len)
-{
-	return crc32(crc, buf, len);
-}
-
-static u32
-select_initial_crc(void)
-{
-	if (rand() & 1)
-		return 0;
-	return ((u32)rand() << 16) | rand();
-}
-
-static u32
-select_initial_adler(void)
-{
-	if (rand() & 1)
-		return 1;
-	return ((u32)(rand() % 65521) << 16) | (rand() % 65521);
-}
-
-static void
-test_initial_values(cksum_fn_t cksum, u32 expected)
-{
-	ASSERT(cksum(0, NULL, 0) == expected);
-	if (cksum != zlib_adler32) /* broken */
-		ASSERT(cksum(0, NULL, 1) == expected);
-	ASSERT(cksum(0, NULL, 1234) == expected);
-	ASSERT(cksum(1234, NULL, 0) == expected);
-	ASSERT(cksum(1234, NULL, 1234) == expected);
-}
-
-static void
-test_multipart(const u8 *buffer, unsigned size, const char *name,
-	       cksum_fn_t cksum, u32 v, u32 expected)
-{
-	unsigned division = (size != 0) ? rand() % size : 0;
-	v = cksum(v, buffer, division);
-	v = cksum(v, buffer + division, size - division);
-	if (v != expected) {
-		fprintf(stderr, "%s checksum failed multipart test\n", name);
-		ASSERT(0);
-	}
-}
-
-static void
-test_checksums(const void *buffer, unsigned size, const char *name,
-	       cksum_fn_t cksum1, cksum_fn_t cksum2, u32 initial_value)
-{
-	u32 v1 = cksum1(initial_value, buffer, size);
-	u32 v2 = cksum2(initial_value, buffer, size);
-
-	if (v1 != v2) {
-		fprintf(stderr, "%s checksum mismatch\n", name);
-		fprintf(stderr, "initial_value=0x%08"PRIx32", buffer=%p, "
-			"contents ", initial_value, buffer);
-		for (unsigned i = 0; i < size; i++)
-			fprintf(stderr, "%02x", ((const u8 *)buffer)[i]);
-		fprintf(stderr, "\n");
-		ASSERT(0);
-	}
-
-	if ((rand() & 15) == 0) {
-		test_multipart(buffer, size, name, cksum1, initial_value, v1);
-		test_multipart(buffer, size, name, cksum2, initial_value, v1);
-	}
-}
-
-int
-tmain(int argc, tchar *argv[])
-{
-	u8 buffer[256];
-
-	rng_seed = time(NULL);
-	srand(rng_seed);
-
-	test_initial_values(libdeflate_adler32, 1);
-	test_initial_values(zlib_adler32, 1);
-	test_initial_values(libdeflate_crc32, 0);
-	test_initial_values(zlib_crc32, 0);
-
-	for (uint32_t i = 0; i < 50000; i++) {
-		/* test different buffer sizes and alignments */
-		int start = rand() % sizeof(buffer);
-		int len = rand() % (sizeof(buffer) - start);
-
-		for (int i = start; i < start + len; i++)
-			buffer[i] = rand();
-
-		test_checksums(&buffer[start], len, "Adler-32",
-			       libdeflate_adler32, zlib_adler32,
-			       select_initial_adler());
-
-		test_checksums(&buffer[start], len, "CRC-32",
-			       libdeflate_crc32, zlib_crc32,
-			       select_initial_crc());
-	}
-
-	printf("Adler-32 and CRC-32 checksum tests passed!\n");
-
-	return 0;
-}

data/ext/libdeflate/libdeflate/programs/tgetopt.c

@@ -1,118 +0,0 @@
-/*
- * tgetopt.c - portable replacement for GNU getopt()
- *
- * Copyright 2016 Eric Biggers
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "prog_util.h"
-
-tchar *toptarg;
-int toptind = 1, topterr = 1, toptopt;
-
-/*
- * This is a simple implementation of getopt().  It can be compiled with either
- * 'char' or 'wchar_t' as the character type.
- *
- * Do *not* use this implementation if you need any of the following features,
- * as they are not supported:
- *	- Long options
- *	- Option-related arguments retained in argv, not nulled out
- *	- '+' and '-' characters in optstring
- */
-int
-tgetopt(int argc, tchar *argv[], const tchar *optstring)
-{
-	static tchar empty[1];
-	static tchar *nextchar;
-	static bool done;
-
-	if (toptind == 1) {
-		/* Starting to scan a new argument vector */
-		nextchar = NULL;
-		done = false;
-	}
-
-	while (!done && (nextchar != NULL || toptind < argc)) {
-		if (nextchar == NULL) {
-			/* Scanning a new argument */
-			tchar *arg = argv[toptind++];
-			if (arg[0] == '-' && arg[1] != '\0') {
-				if (arg[1] == '-' && arg[2] == '\0') {
-					/* All args after "--" are nonoptions */
-					argv[toptind - 1] = NULL;
-					done = true;
-				} else {
-					/* Start of short option characters */
-					nextchar = &arg[1];
-				}
-			}
-		} else {
-			/* More short options in previous arg */
-			tchar opt = *nextchar;
-			tchar *p = tstrchr(optstring, opt);
-			if (p == NULL) {
-				if (topterr)
-					msg("invalid option -- '%"TC"'", opt);
-				toptopt = opt;
-				return '?';
-			}
-			/* 'opt' is a valid short option character */
-			nextchar++;
-			toptarg = NULL;
-			if (*(p + 1) == ':') {
-				/* 'opt' can take an argument */
-				if (*nextchar != '\0') {
-					/* Optarg is in same argv argument */
-					toptarg = nextchar;
-					nextchar = empty;
-				} else if (toptind < argc && *(p + 2) != ':') {
-					/* Optarg is next argv argument */
-					argv[toptind - 1] = NULL;
-					toptarg = argv[toptind++];
-				} else if (*(p + 2) != ':') {
-					if (topterr && *optstring != ':') {
-						msg("option requires an "
-						    "argument -- '%"TC"'", opt);
-					}
-					toptopt = opt;
-					opt = (*optstring == ':') ? ':' : '?';
-				}
-			}
-			if (*nextchar == '\0') {
-				argv[toptind - 1] = NULL;
-				nextchar = NULL;
-			}
-			return opt;
-		}
-	}
-
-	/* Done scanning.  Move all nonoptions to the end, set optind to the
-	 * index of the first nonoption, and return -1. */
-	toptind = argc;
-	while (--argc > 0)
-		if (argv[argc] != NULL)
-			argv[--toptind] = argv[argc];
-	done = true;
-	return -1;
-}

data/ext/libdeflate/libdeflate/tools/afl-fuzz/Makefile

@@ -1,12 +0,0 @@
-SRC := $(wildcard */*.c)
-EXE := $(SRC:.c=)
-
-CFLAGS := -O2 -s
-LDLIBS := -ldeflate
-LDFLAGS := -L../..
-CPPFLAGS := -I../..
-
-all:$(EXE)
-
-clean:
-	rm -f $(EXE)

data/ext/libdeflate/libdeflate/tools/afl-fuzz/deflate_compress/fuzz.c

@@ -1,40 +0,0 @@
-#include <assert.h>
-#include <libdeflate.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-int main(int argc, char **argv)
-{
-	struct libdeflate_decompressor *d;
-	struct libdeflate_compressor *c;
-	int ret;
-	int fd = open(argv[1], O_RDONLY);
-	struct stat stbuf;
-	assert(fd >= 0);
-	ret = fstat(fd, &stbuf);
-	assert(!ret);
-
-	char in[stbuf.st_size];
-	ret = read(fd, in, sizeof in);
-	assert(ret == sizeof in);
-
-	c = libdeflate_alloc_compressor(6);
-	d = libdeflate_alloc_decompressor();
-
-	char out[sizeof(in)];
-	char checkarray[sizeof(in)];
-
-	size_t csize = libdeflate_deflate_compress(c, in,sizeof in, out, sizeof out);
-	if (csize) {
-		enum libdeflate_result res;
-		res = libdeflate_deflate_decompress(d, out, csize, checkarray, sizeof in, NULL);
-		assert(!res);
-		assert(!memcmp(in, checkarray, sizeof in));
-	}
-
-	libdeflate_free_compressor(c);
-	libdeflate_free_decompressor(d);
-	return 0;
-}

data/ext/libdeflate/libdeflate/tools/afl-fuzz/deflate_decompress/fuzz.c

@@ -1,28 +0,0 @@
-#include <assert.h>
-#include <libdeflate.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-int main(int argc, char **argv)
-{
-	struct libdeflate_decompressor *d;
-	int ret;
-	int fd = open(argv[1], O_RDONLY);
-	struct stat stbuf;
-	assert(fd >= 0);
-	ret = fstat(fd, &stbuf);
-	assert(!ret);
-
-	char in[stbuf.st_size];
-	ret = read(fd, in, sizeof in);
-	assert(ret == sizeof in);
-
-	char out[sizeof(in) * 3];
-
-	d = libdeflate_alloc_decompressor();
-
-	libdeflate_deflate_decompress(d, in, sizeof in, out, sizeof out, NULL);
-	libdeflate_free_decompressor(d);
-	return 0;
-}

data/ext/libdeflate/libdeflate/tools/afl-fuzz/deflate_decompress/inputs/0

@@ -1,3 +0,0 @@
-u�1
-�@Eg�Bl5
-��V���6j��X{�i=���l=����l�����?t���D

data/ext/libdeflate/libdeflate/tools/afl-fuzz/gzip_decompress/fuzz.c

@@ -1,28 +0,0 @@
-#include <assert.h>
-#include <libdeflate.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-int main(int argc, char **argv)
-{
-	struct libdeflate_decompressor *d;
-	int ret;
-	int fd = open(argv[1], O_RDONLY);
-	struct stat stbuf;
-	assert(fd >= 0);
-	ret = fstat(fd, &stbuf);
-	assert(!ret);
-
-	char in[stbuf.st_size];
-	ret = read(fd, in, sizeof in);
-	assert(ret == sizeof in);
-
-	char out[sizeof(in) * 3];
-
-	d = libdeflate_alloc_decompressor();
-
-	libdeflate_gzip_decompress(d, in, sizeof in, out, sizeof out, NULL);
-	libdeflate_free_decompressor(d);
-	return 0;
-}

data/ext/libdeflate/libdeflate/tools/afl-fuzz/prepare_for_fuzz.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-make -C ../../ clean
-make clean
-AFL_HARDEN=1 make CC=afl-gcc -C ../../
-AFL_HARDEN=1 make CC=afl-gcc
-
-for dir in $(find . -mindepth 1 -maxdepth 1 -type d); do
-	rm -rf /tmp/$dir
-	cp -va $dir /tmp/$dir
-	mkdir -p /tmp/$dir/outputs
-done

data/ext/libdeflate/libdeflate/tools/afl-fuzz/zlib_decompress/fuzz.c

@@ -1,28 +0,0 @@
-#include <assert.h>
-#include <libdeflate.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-int main(int argc, char **argv)
-{
-	struct libdeflate_decompressor *d;
-	int ret;
-	int fd = open(argv[1], O_RDONLY);
-	struct stat stbuf;
-	assert(fd >= 0);
-	ret = fstat(fd, &stbuf);
-	assert(!ret);
-
-	char in[stbuf.st_size];
-	ret = read(fd, in, sizeof in);
-	assert(ret == sizeof in);
-
-	char out[sizeof(in) * 3];
-
-	d = libdeflate_alloc_decompressor();
-
-	libdeflate_zlib_decompress(d, in, sizeof in, out, sizeof out, NULL);
-	libdeflate_free_decompressor(d);
-	return 0;
-}

data/ext/libdeflate/libdeflate/tools/afl-fuzz/zlib_decompress/inputs/0

@@ -1,3 +0,0 @@
-x�u�1
-�@Eg�Bl5
-��V���6j��X{�i=���l=����l�����?t���D

data/ext/libdeflate/libdeflate/tools/android_build.sh

@@ -1,104 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-ARCH="arm32"
-COMPILER="gcc"
-NDKDIR="/opt/android-ndk"
-DISABLE_NEON=
-
-usage() {
-	cat << EOF
-Usage: $0 [OPTION]... -- [BENCHMARK_PROGRAM_ARG]...
-Build the libdeflate test programs for Android
-
-  --arch=ARCH          Architecture: arm32|arm64 (default: $ARCH)
-  --compiler=COMPILER  Compiler: gcc|clang (default: $COMPILER)
-  --ndkdir=NDKDIR      Android NDK directory (default: $NDKDIR)
-  --disable-neon       Disable NEON instructions
-EOF
-}
-
-if ! options=$(getopt -o '' \
-	-l 'arch:,compiler:,ndkdir:,disable-neon,help' -- "$@"); then
-	usage
-	exit 1
-fi
-
-eval set -- "$options"
-
-while [ $# -gt 0 ]; do
-	case "$1" in
-	--arch)
-		ARCH="$2"
-		shift
-		;;
-	--compiler)
-		COMPILER="$2"
-		shift
-		;;
-	--ndkdir)
-		NDKDIR="$2"
-		shift
-		;;
-	--disable-neon)
-		DISABLE_NEON=1
-		;;
-	--help)
-		usage
-		exit 0
-		;;
-	--)
-		shift
-		break
-		;;
-	*)
-		echo 1>&2 "Unknown option \"$1\""
-		usage
-		exit 1
-	esac
-	shift
-done
-
-CFLAGS="-fPIC -pie"
-
-case "$ARCH" in
-arm|arm32|aarch32)
-	GCC_TOOLCHAIN="arm-linux-androideabi-4.9"
-	CLANG_TARGET="armv7-none-linux-androideabi"
-	if [ -n "$DISABLE_NEON" ]; then
-		CFLAGS+=" -march=armv6"
-	else
-		CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-	fi
-	CFLAGS+=" --sysroot=\"$NDKDIR/platforms/android-12/arch-arm\""
-	;;
-arm64|aarch64)
-	GCC_TOOLCHAIN="aarch64-linux-android-4.9"
-	CLANG_TARGET="aarch64-none-linux-android"
-	CFLAGS+=" --sysroot=\"$NDKDIR/platforms/android-21/arch-arm64\""
-	;;
-*)
-	echo 1>&2 "Unknown architecture: \"$ARCH\""
-	usage
-	exit 1
-esac
-
-case "$COMPILER" in
-gcc)
-	CC="\"$NDKDIR/toolchains/$GCC_TOOLCHAIN/prebuilt/linux-x86_64/bin/${GCC_TOOLCHAIN%-*}-gcc\""
-	CFLAGS+=" -pie"
-	;;
-clang)
-	CC="\"$NDKDIR/toolchains/llvm/prebuilt/linux-x86_64/bin/clang\""
-	CFLAGS+=" -target \"$CLANG_TARGET\""
-	CFLAGS+=" -gcc-toolchain \"$NDKDIR/toolchains/$GCC_TOOLCHAIN/prebuilt/linux-x86_64\""
-	;;
-*)
-	echo 1>&2 "Unknown compiler: \"$COMPILER\""
-	usage
-	exit 1
-esac
-
-make -j$(grep -c processor /proc/cpuinfo) test_programs \
-	CC="$CC" CFLAGS="$CFLAGS"

data/ext/libdeflate/libdeflate/tools/checksum_benchmarks.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-if [ $# -eq 0 ]; then
-	FILE="$HOME/data/silesia"
-	echo "Using default FILE: $FILE"
-	echo
-elif [ $# -eq 1 ]; then
-	FILE="$1"
-else
-	echo "Usage: $0 [FILE]" 1>&2
-	exit 1
-fi
-
-
-if ! grep -q '\<sse2\>' /proc/cpuinfo; then
-	echo "This script must be run on an x86 CPU" 1>&2
-	exit 1
-fi
-
-if [ -n "$(git status -s | egrep 'adler32.c|crc32.c')" ]; then
-	echo "This script will overwrite adler32.c and crc32.c, which" \
-		"have uncommitted changes.  Refusing to run." 1>&2
-	exit 1
-fi
-
-do_benchmark() {
-	method="$1"
-	shift
-	speed=$(./checksum "$@" -t "$FILE" | \
-		grep -o '[0-9]\+ MB/s' | grep -o '[0-9]\+')
-	printf "%-36s%-10s\n" "$method" "$speed"
-}
-
-sort_by_speed() {
-	awk '{print $NF, $0}' | sort -nr | cut -f2- -d' '
-}
-
-cat << EOF
-Method                              Speed (MB/s)
-------                              ------------
-EOF
-
-# CRC-32
-(
-if grep -q '\<pclmulqdq\>' /proc/cpuinfo; then
-	make checksum > /dev/null
-	do_benchmark "CRC-32 (libdeflate, PCLMUL/AVX)"
-	sed -i '/^\#if NEED_PCLMUL_IMPL && !defined(__AVX__)/,/^\#endif$/d' lib/crc32.c
-	make checksum > /dev/null
-	do_benchmark "CRC-32 (libdeflate, PCLMUL)"
-fi
-sed -i '/^#if defined(__PCLMUL__)/,/^\#endif$/d' lib/crc32.c
-make checksum > /dev/null
-do_benchmark "CRC-32 (libdeflate, generic)"
-git checkout -f lib/crc32.c > /dev/null
-do_benchmark "CRC-32 (zlib)" -Z
-) | sort_by_speed
-
-# Adler-32
-echo
-(
-if grep -q '\<avx2\>' /proc/cpuinfo; then
-	make checksum > /dev/null
-	do_benchmark "Adler-32 (libdeflate, AVX2)" -A
-fi
-sed -i '/^#if defined(__AVX2__)/,/^\#endif$/d' lib/adler32.c
-make checksum > /dev/null
-do_benchmark "Adler-32 (libdeflate, SSE2)" -A
-sed -i '/^#ifdef __SSE2__/,/^\#endif$/d' lib/adler32.c
-make checksum > /dev/null
-do_benchmark "Adler-32 (libdeflate, generic)" -A
-git checkout -f lib/adler32.c > /dev/null
-do_benchmark "Adler-32 (zlib)" -A -Z
-) | sort_by_speed

data/ext/libdeflate/libdeflate/tools/exec_tests.sh

@@ -1,30 +0,0 @@
-#
-# Helper script used by run_tests.sh, not intended to be run directly
-#
-
-set -eu
-
-run_cmd() {
-	echo "$WRAPPER $@"
-	$WRAPPER "$@" > /dev/null
-}
-
-run_cmd ./test_checksums
-
-for format in '' '-g' '-z'; do
-	for ref_impl in '' '-Y' '-Z'; do
-		run_cmd ./benchmark $format $ref_impl $SMOKEDATA
-	done
-done
-for level in 1 3 7 9; do
-	for ref_impl in '' '-Y'; do
-		run_cmd ./benchmark -$level $ref_impl $SMOKEDATA
-	done
-done
-for level in 1 3 7 9 12; do
-	for ref_impl in '' '-Z'; do
-		run_cmd ./benchmark -$level $ref_impl $SMOKEDATA
-	done
-done
-
-echo "exec_tests finished successfully" # Needed for 'adb shell'