Commit 56152c37 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

correct instrumentation

parent 7a6eb577

lib_com/options.h

+11 −10
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


#define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */



//#define WMOPS                                   /* Activate complexity and memory counters */

#define WMOPS                                   /* Activate complexity and memory counters */

#ifdef WMOPS

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */

/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */
@@ -80,14 +80,15 @@ 
//#define HARM_SCE_INIT



// new speedups

//#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/

//#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/

//#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx_0                  /*FhG: reduces WMOPS - bit-exact*/

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig  /*FhG: reduces WMOPS - bit-exact*/

//#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx             // 0.4 WMOPS - BE?

#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/ //   | < TODO: check border cases

#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/ //   |   2.4 WMOPS according pipe

#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx_0                  /*FhG: reduces WMOPS - bit-exact*/ //   |

#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig  /*FhG: reduces WMOPS - bit-exact*/ //   |



//#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx                                              // |   0.4 WMOPS - BE?

// 

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE1       // nonbe                          //   |

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE2       // nonbe    // | > 3.1 WMOPS, pipe testing https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/pipelines/50562

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE2       // nonbe                          //   |   3.1 WMOPS, pipe testing https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/pipelines/50562

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE3       // nonbe                          //   |



//-----------------------------------------------------------------------

lib_com/tools_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -809,11 +809,11 @@ void Copy_Scale_sig_16_32_no_sat( 
    }

    // ELSE

    {

        // Word16 tmp = extract_l( L_tmp );

        Word16 tmp = extract_l( L_tmp );

        FOR( i = 0; i < lg; i++ )

        {

            y[i] = L_mult( x[i], L_tmp );

            move32(); /* saturation can occur here */

            y[i] = L_mult( x[i], tmp );

            move32();

        }

    }

#else