FS#12117: Use more IRAM for atrac3. Speeds up decoding from 1-2% (PP5022, PP5024, S5L870x) to 11% (MCF5250).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29892 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 41 insertions, 34 deletions

diff --git a/apps/codecs/atrac3_rm.c b/apps/codecs/atrac3_rm.c
index 4c619898bb..b666dd4513 100644
--- a/apps/codecs/atrac3_rm.c
+++ b/apps/codecs/atrac3_rm.c
@@ -28,9 +28,9 @@
 
 CODEC_HEADER
 
-static RMContext rmctx;
-static RMPacket pkt;
-static ATRAC3Context q IBSS_ATTR;
+static RMContext rmctx  IBSS_ATTR_LARGE_IRAM;
+static RMPacket pkt     IBSS_ATTR_LARGE_IRAM;
+static ATRAC3Context q  IBSS_ATTR;
 
 static void init_rm(RMContext *rmctx)
 {
diff --git a/apps/codecs/libatrac/atrac3.c b/apps/codecs/libatrac/atrac3.c
index be41df5aad..711537fa96 100644
--- a/apps/codecs/libatrac/atrac3.c
+++ b/apps/codecs/libatrac/atrac3.c
@@ -60,12 +60,15 @@
     #define QMFWIN_TYPE int32_t
 #endif
 
-static VLC          spectral_coeff_tab[7];
+static VLC          spectral_coeff_tab[7]     IBSS_ATTR_LARGE_IRAM;
 static QMFWIN_TYPE  qmf_window[48]            IBSS_ATTR MEM_ALIGN_ATTR; 
 static int32_t      atrac3_spectrum [2][1024] IBSS_ATTR MEM_ALIGN_ATTR;
 static int32_t      atrac3_IMDCT_buf[2][ 512] IBSS_ATTR MEM_ALIGN_ATTR;
 static int32_t      atrac3_prevFrame[2][1024] IBSS_ATTR MEM_ALIGN_ATTR;
-static channel_unit channel_units[2] IBSS_ATTR_LARGE_IRAM;
+static channel_unit channel_units[2]          IBSS_ATTR_LARGE_IRAM;
+static VLC_TYPE     atrac3_vlc_table[4096][2] IBSS_ATTR_LARGE_IRAM;
+static int          vlcs_initialized = 0;
+
 
 
 /**
@@ -1153,13 +1156,11 @@ int atrac3_decode_frame(unsigned long block_align, ATRAC3Context *q,
  * Atrac3 initialization
  *
  * @param rmctx     pointer to the RMContext
- */
+ */ 
 int atrac3_decode_init(ATRAC3Context *q, struct mp3entry *id3)
 {
     int i;
     uint8_t *edata_ptr = (uint8_t*)&id3->id3v2buf;
-    static VLC_TYPE atrac3_vlc_table[4096][2];
-    static int vlcs_initialized = 0;
 
 #if defined(CPU_COLDFIRE)
     coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE);
diff --git a/apps/codecs/libatrac/atrac3.h b/apps/codecs/libatrac/atrac3.h
index 941bb6d2ad..64086b6411 100644
--- a/apps/codecs/libatrac/atrac3.h
+++ b/apps/codecs/libatrac/atrac3.h
@@ -23,14 +23,17 @@
 #include "../librm/rm.h"
 #include "codeclib.h"
 
-#if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || (CONFIG_CPU == MCF5250)
-/* PP5022/24 and MCF5250 have larger IRAM */
-#define IBSS_ATTR_LARGE_IRAM  IBSS_ATTR
-#define ICODE_ATTR_LARGE_IRAM ICODE_ATTR
+#if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || \
+    (CONFIG_CPU == MCF5250) || defined(CPU_S5L870X)
+/* PP5022/24, MCF5250 and S5L870x have larger IRAM */
+#define IBSS_ATTR_LARGE_IRAM    IBSS_ATTR
+#define ICODE_ATTR_LARGE_IRAM   ICODE_ATTR
+#define ICONST_ATTR_LARGE_IRAM  ICONST_ATTR
 #else
 /* other CPUs IRAM is not large enough */
 #define IBSS_ATTR_LARGE_IRAM
 #define ICODE_ATTR_LARGE_IRAM
+#define ICONST_ATTR_LARGE_IRAM
 #endif
 
 /* These structures are needed to store the parsed gain control data. */
diff --git a/apps/codecs/libatrac/atrac3data.h b/apps/codecs/libatrac/atrac3data.h
index 0da9d9e758..30abb37572 100644
--- a/apps/codecs/libatrac/atrac3data.h
+++ b/apps/codecs/libatrac/atrac3data.h
@@ -32,88 +32,91 @@
 
 /* VLC tables */
 
-static const uint8_t huffcode1[9] = {
+static const uint8_t huffcode1[9] ICONST_ATTR_LARGE_IRAM = {
   0x0,0x4,0x5,0xC,0xD,0x1C,0x1D,0x1E,0x1F,
 };
 
-static const uint8_t huffbits1[9] = {
+static const uint8_t huffbits1[9] ICONST_ATTR_LARGE_IRAM = {
   1,3,3,4,4,5,5,5,5,
 };
 
-static const uint8_t huffcode2[5] = {
+static const uint8_t huffcode2[5] ICONST_ATTR_LARGE_IRAM = {
   0x0,0x4,0x5,0x6,0x7,
 };
 
-static const uint8_t huffbits2[5] = {
+static const uint8_t huffbits2[5] ICONST_ATTR_LARGE_IRAM = {
   1,3,3,3,3,
 };
 
-static const uint8_t huffcode3[7] = {
+static const uint8_t huffcode3[7] ICONST_ATTR_LARGE_IRAM = {
 0x0,0x4,0x5,0xC,0xD,0xE,0xF,
 };
 
-static const uint8_t huffbits3[7] = {
+static const uint8_t huffbits3[7] ICONST_ATTR_LARGE_IRAM = {
   1,3,3,4,4,4,4,
 };
 
-static const uint8_t huffcode4[9] = {
+static const uint8_t huffcode4[9] ICONST_ATTR_LARGE_IRAM = {
   0x0,0x4,0x5,0xC,0xD,0x1C,0x1D,0x1E,0x1F,
 };
 
-static const uint8_t huffbits4[9] = {
+static const uint8_t huffbits4[9] ICONST_ATTR_LARGE_IRAM = {
   1,3,3,4,4,5,5,5,5,
 };
 
-static const uint8_t huffcode5[15] = {
+static const uint8_t huffcode5[15] ICONST_ATTR_LARGE_IRAM = {
   0x0,0x2,0x3,0x8,0x9,0xA,0xB,0x1C,0x1D,0x3C,0x3D,0x3E,0x3F,0xC,0xD,
 };
 
-static const uint8_t huffbits5[15] = {
+static const uint8_t huffbits5[15] ICONST_ATTR_LARGE_IRAM = {
   2,3,3,4,4,4,4,5,5,6,6,6,6,4,4
 };
 
-static const uint8_t huffcode6[31] = {
+static const uint8_t huffcode6[31] ICONST_ATTR_LARGE_IRAM = {
   0x0,0x2,0x3,0x4,0x5,0x6,0x7,0x14,0x15,0x16,0x17,0x18,0x19,0x34,0x35,
   0x36,0x37,0x38,0x39,0x3A,0x3B,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,0x8,0x9,
 };
 
-static const uint8_t huffbits6[31] = {
+static const uint8_t huffbits6[31] ICONST_ATTR_LARGE_IRAM = {
   3,4,4,4,4,4,4,5,5,5,5,5,5,6,6,6,6,6,6,6,6,7,7,7,7,7,7,7,7,4,4
 };
 
-static const uint8_t huffcode7[63] = {
+static const uint8_t huffcode7[63] ICONST_ATTR_LARGE_IRAM = {
   0x0,0x8,0x9,0xA,0xB,0xC,0xD,0xE,0xF,0x10,0x11,0x24,0x25,0x26,0x27,0x28,
   0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x68,0x69,0x6A,0x6B,0x6C,
   0x6D,0x6E,0x6F,0x70,0x71,0x72,0x73,0x74,0x75,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,
   0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,0x2,0x3,
 };
 
-static const uint8_t huffbits7[63] = {
+static const uint8_t huffbits7[63] ICONST_ATTR_LARGE_IRAM = {
   3,5,5,5,5,5,5,5,5,5,5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,7,7,7,7,7,
   7,7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,4,4
 };
 
-static const uint8_t huff_tab_sizes[7] = {
+static const uint8_t huff_tab_sizes[7] ICONST_ATTR_LARGE_IRAM = {
   9, 5, 7, 9, 15, 31, 63,
 };
 
-static const uint8_t* const huff_codes[7] = {
+static const uint8_t* const huff_codes[7] ICONST_ATTR_LARGE_IRAM = {
   huffcode1,huffcode2,huffcode3,huffcode4,huffcode5,huffcode6,huffcode7,
 };
 
-static const uint8_t* const huff_bits[7] = {
+static const uint8_t* const huff_bits[7] ICONST_ATTR_LARGE_IRAM = {
   huffbits1,huffbits2,huffbits3,huffbits4,huffbits5,huffbits6,huffbits7,
 };
 
-static const uint16_t atrac3_vlc_offs[] = {
+static const uint16_t atrac3_vlc_offs[] ICONST_ATTR_LARGE_IRAM = {
     0,512,1024,1536,2048,2560,3072,3584,4096
 };
 
 /* selector tables */
 
-static const uint8_t CLCLengthTab[8] = {0, 4, 3, 3, 4, 4, 5, 6};
-static const int8_t seTab_0[4] = {0, 1, -2, -1};
-static const int8_t decTable1[18] = {0,0, 0,1, 0,-1, 1,0, -1,0, 1,1, 1,-1, -1,1, -1,-1};
+static const uint8_t CLCLengthTab[8] ICONST_ATTR_LARGE_IRAM = {
+    0, 4, 3, 3, 4, 4, 5, 6};
+static const int8_t seTab_0[4] ICONST_ATTR_LARGE_IRAM = {
+    0, 1, -2, -1};
+static const int8_t decTable1[18] ICONST_ATTR_LARGE_IRAM = {
+    0,0, 0,1, 0,-1, 1,0, -1,0, 1,1, 1,-1, -1,1, -1,-1};
 
 
 /* tables for the scalefactor decoding */
@@ -122,7 +125,7 @@ static const float iMaxQuant[8] = {
   0.0, 1.0/1.5, 1.0/2.5, 1.0/3.5, 1.0/4.5, 1.0/7.5, 1.0/15.5, 1.0/31.5
 };
 */
-static const uint16_t subbandTab[33] = {
+static const uint16_t subbandTab[33] ICONST_ATTR_LARGE_IRAM = {
   0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224,
   256, 288, 320, 352, 384, 416, 448, 480, 512, 576, 640, 704, 768, 896, 1024
 };