From fabf58ed4827c82c6edd5eb1ede872116ea7cb9e Mon Sep 17 00:00:00 2001 From: DRC Date: Thu, 31 Oct 2013 07:40:24 +0000 Subject: [PATCH] Make environment variable syntax consistent between ARM and x86 code, and add an option to disable SIMD on x86 (this option will be added to the x86-64 code as well, but it makes more sense to add it when we add AVX support.) git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1073 632fc199-4ca6-4c93-a231-07263d6284db --- simd/jsimd_arm.c | 6 +++--- simd/jsimd_i386.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/simd/jsimd_arm.c b/simd/jsimd_arm.c index cae84df0..a70db7eb 100644 --- a/simd/jsimd_arm.c +++ b/simd/jsimd_arm.c @@ -2,7 +2,7 @@ * jsimd_arm.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011 D. R. Commander + * Copyright 2009-2011, 2013 D. R. Commander * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. @@ -123,10 +123,10 @@ init_simd (void) #endif /* Force different settings through environment variables */ - env = getenv("JSIMD_FORCE_ARM_NEON"); + env = getenv("JSIMD_FORCENEON"); if ((env != NULL) && (strcmp(env, "1") == 0)) simd_support &= JSIMD_ARM_NEON; - env = getenv("JSIMD_FORCE_NO_SIMD"); + env = getenv("JSIMD_FORCENONE"); if ((env != NULL) && (strcmp(env, "1") == 0)) simd_support = 0; } diff --git a/simd/jsimd_i386.c b/simd/jsimd_i386.c index e96f5b8d..b731edb4 100644 --- a/simd/jsimd_i386.c +++ b/simd/jsimd_i386.c @@ -2,7 +2,7 @@ * jsimd_i386.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011 D. R. Commander + * Copyright 2009-2011, 2013 D. R. Commander * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. @@ -59,6 +59,9 @@ init_simd (void) env = getenv("JSIMD_FORCESSE2"); if ((env != NULL) && (strcmp(env, "1") == 0)) simd_support &= JSIMD_SSE2; + env = getenv("JSIMD_FORCENONE"); + if ((env != NULL) && (strcmp(env, "1") == 0)) + simd_support = 0; } GLOBAL(int)