[FFmpeg-devel] [PATCH] Optimization of AMR NB and WB decoders for MIPS

[Babic, Nedeljko]

> Can't you make them selectable at runtime like we try for all
> optimizations?

Can you please be more specific regarding this?
Changes made to configure script are similar to what was done for 
other architectures and the way optimizations are included is also 
similar (to other architectures).

________________________________________
Od: ffmpeg-devel-bounces at ffmpeg.org [ffmpeg-devel-bounces at ffmpeg.org] u ime korisnika Reimar Döffinger [Reimar.Doeffinger at gmx.de]
Poslato: 18. maj 2012 15:58
Za: FFmpeg development discussions and patches
Tema: Re: [FFmpeg-devel] [PATCH] Optimization of AMR NB and WB decoders for MIPS

On Fri, May 18, 2012 at 03:47:30PM +0200, Nedeljko Babic wrote:
> AMR NB and WB decoders are optimized for MIPS architecture.
> Appropriate Makefiles are changed accordingly.
>
> Configure script is changed in order to support optimizations.
>  Optimizations are enabled by default when compiling is done for
>   mips architecture.
>  Appropriate cflags are automatically set.
>  Support for several mips CPUs is added in configure script.

Can't you make them selectable at runtime like we try for all
optimizations?

> + * Copyright (c) 2012
> + *      MIPS Technologies, Inc., California.
> + *
> + * 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.
> + * 3. Neither the name of the MIPS Technologies, Inc., nor the names of its
> + *    contributors may be used to endorse or promote products derived from
> + *    this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE MIPS TECHNOLOGIES, INC. ``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 MIPS TECHNOLOGIES, INC. 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.
> + *
> + * Author:  Nedeljko Babic (nbabic at mips.com)
> + *
> + * various filters for ACELP-based codecs optimized for MIPS
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

Someone should probably check that these two are actually compatible...

> +#if HAVE_MIPSFPU && HAVE_INLINE_ASM

Since that seems to cover the whole file, the file just shouldn't be
compiled if they aren't set, instead of having the if inside the file.

> +/**
> + * @file
> + * MIPS optimization for some libm functions
> + */
> +
> +#ifndef AVUTIL_LIBM_MIPS_H
> +#define AVUTIL_LIBM_MIPS_H
> +
> +static av_always_inline av_const long int lrintf_mips(float x)
> +{
> +    register int ret_int;
> +
> +    __asm__ __volatile__ (
> +        "cvt.w.s    %[x],       %[x]    \n\t"
> +        "mfc1       %[ret_int], %[x]    \n\t"
> +
> +        :[x]"+f"(x), [ret_int]"=r"(ret_int)
> +    );
> +    return ret_int;
> +}
> +
> +#undef lrintf
> +#define lrintf(x)   lrintf_mips(x)
> +
> +#define HAVE_LRINTF 1

This really belongs into the system libm or compiler, not FFmpeg IMO.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel at ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel