aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarkus F.X.J. Oberhumer <markus@oberhumer.com>2013-02-04 02:26:14 +0100
committerSimon Shields <keepcalm444@gmail.com>2016-06-12 21:20:20 +1000
commit579b11bb139ae8ab650f2bb6d6c0fc71bec529cf (patch)
tree9bee9d6931a69b32ef44002e7b89eaafaf1e4c15 /lib
parent39a4e2420fe3fec2019dc3ad9ebfc6c4ae7869c3 (diff)
downloadkernel_samsung_smdk4412-579b11bb139ae8ab650f2bb6d6c0fc71bec529cf.tar.gz
kernel_samsung_smdk4412-579b11bb139ae8ab650f2bb6d6c0fc71bec529cf.tar.bz2
kernel_samsung_smdk4412-579b11bb139ae8ab650f2bb6d6c0fc71bec529cf.zip
lib/lzo: huge LZO decompression speedup on ARM by using unaligned access
Change-Id: I4dc172b2822504c3f2db1913ed9404e031861d55 Signed-off-by: Markus F.X.J. Oberhumer <markus@oberhumer.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/lzo/lzo1x_decompress_safe.c4
-rw-r--r--lib/lzo/lzodefs.h6
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/lzo/lzo1x_decompress_safe.c b/lib/lzo/lzo1x_decompress_safe.c
index 569985d522d..e3edc5f3f5e 100644
--- a/lib/lzo/lzo1x_decompress_safe.c
+++ b/lib/lzo/lzo1x_decompress_safe.c
@@ -72,9 +72,11 @@ copy_literal_run:
COPY8(op, ip);
op += 8;
ip += 8;
+# if !defined(__arm__)
COPY8(op, ip);
op += 8;
ip += 8;
+# endif
} while (ip < ie);
ip = ie;
op = oe;
@@ -159,9 +161,11 @@ copy_literal_run:
COPY8(op, m_pos);
op += 8;
m_pos += 8;
+# if !defined(__arm__)
COPY8(op, m_pos);
op += 8;
m_pos += 8;
+# endif
} while (op < oe);
op = oe;
if (HAVE_IP(6)) {
diff --git a/lib/lzo/lzodefs.h b/lib/lzo/lzodefs.h
index 6710b83ce72..db756ccb275 100644
--- a/lib/lzo/lzodefs.h
+++ b/lib/lzo/lzodefs.h
@@ -12,8 +12,14 @@
*/
+#if 1 && defined(__arm__) && ((__LINUX_ARM_ARCH__ >= 6) || defined(__ARM_FEATURE_UNALIGNED))
+#define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1
+#define COPY4(dst, src) \
+ * (u32 *) (void *) (dst) = * (const u32 *) (const void *) (src)
+#else
#define COPY4(dst, src) \
put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst))
+#endif
#if defined(__x86_64__)
#define COPY8(dst, src) \
put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst))