Merge pull request #484 from sifive/shrink-itim-benchmark

Bump ldscript-generator to reduce ITIM ramrodata usage
sifive · May 5, 2020 · 532331b · 532331b
2 parents c037112 + 0a13740
commit 532331b
Show file tree

Hide file tree

Showing 38 changed files with 577 additions and 256 deletions.
diff --git a/bsp/freedom-e310-arty/metal.default.lds b/bsp/freedom-e310-arty/metal.default.lds
@@ -23,6 +23,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -148,13 +149,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -186,6 +180,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/freedom-e310-arty/metal.freertos.lds b/bsp/freedom-e310-arty/metal.freertos.lds
@@ -26,6 +26,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -158,13 +159,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -197,6 +191,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/freedom-e310-arty/metal.ramrodata.lds b/bsp/freedom-e310-arty/metal.ramrodata.lds
@@ -27,6 +27,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -152,13 +153,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
 
     /* ITIM SECTION
      *
@@ -178,6 +172,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/freedom-e310-arty/metal.scratchpad.lds b/bsp/freedom-e310-arty/metal.scratchpad.lds
@@ -24,6 +24,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -149,13 +150,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >ram : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >ram :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -187,6 +181,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >ram :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/qemu-sifive-e31/metal.default.lds b/bsp/qemu-sifive-e31/metal.default.lds
@@ -22,6 +22,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -145,13 +146,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -183,6 +177,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/qemu-sifive-e31/metal.freertos.lds b/bsp/qemu-sifive-e31/metal.freertos.lds
@@ -25,6 +25,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -155,13 +156,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -194,6 +188,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/qemu-sifive-e31/metal.ramrodata.lds b/bsp/qemu-sifive-e31/metal.ramrodata.lds
@@ -26,6 +26,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -149,13 +150,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
 
     /* ITIM SECTION
      *
@@ -175,6 +169,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/qemu-sifive-e31/metal.scratchpad.lds b/bsp/qemu-sifive-e31/metal.scratchpad.lds
@@ -23,6 +23,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -146,13 +147,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >ram : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >ram :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -184,6 +178,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >ram :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only

diff --git a/bsp/qemu-sifive-s51/metal.default.lds b/bsp/qemu-sifive-s51/metal.default.lds
@@ -22,6 +22,7 @@ PHDRS
     tls PT_TLS;
     ram PT_LOAD;
     itim_init PT_LOAD;
+    text PT_LOAD;
 }
 
 SECTIONS
@@ -145,13 +146,6 @@ SECTIONS
         KEEP (*(.metal.dtors .metal.dtors.*))
     } >rom : rom
 
-    .text : {
-        *(.text.unlikely .text.unlikely.*)
-        *(.text.startup .text.startup.*)
-        *(.text .text.*)
-        *(.gnu.linkonce.t.*)
-    } >rom :rom
-
     .rodata : {
         *(.rdata)
         *(.rodata .rodata.*)
@@ -183,6 +177,19 @@ SECTIONS
     PROVIDE( metal_segment_itim_target_start = ADDR(.itim) );
     PROVIDE( metal_segment_itim_target_end = ADDR(.itim) + SIZEOF(.itim) );
 
+    /* TEXT SECTION
+     *
+     * The following section contains the code of the program, excluding
+     * everything that's been allocated into the ITIM already
+     */
+
+    .text : {
+        *(.text.unlikely .text.unlikely.*)
+        *(.text.startup .text.startup.*)
+        *(.text .text.*)
+        *(.gnu.linkonce.t.*)
+    } >rom :text
+
     /* RAM SECTION
      *
      * The following sections contain data which is copied from read-only