Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Revert previous per joerg@'s request.



details:   https://anonhg.NetBSD.org/src/rev/28d7753a4795
branches:  trunk
changeset: 333414:28d7753a4795
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sun Nov 02 17:58:14 2014 +0000

description:
Revert previous per joerg@'s request.

According to him, exposing .data.{read_mostly,cacheline_aligned} is
intentional so that people can easily see which variables are optimized.

diffstat:

 sys/arch/amd64/conf/kern.ldscript     |  19 ++++++++++++++-----
 sys/arch/amd64/conf/kern.ldscript.2MB |  15 +++++++++++----
 sys/arch/amd64/conf/kern.ldscript.Xen |  15 +++++++++++----
 sys/arch/i386/conf/kern.ldscript      |  15 +++++++++++----
 sys/arch/i386/conf/kern.ldscript.4MB  |  15 +++++++++++----
 sys/arch/i386/conf/kern.ldscript.Xen  |  15 +++++++++++----
 6 files changed, 69 insertions(+), 25 deletions(-)

diffs (191 lines):

diff -r 0391a661d79e -r 28d7753a4795 sys/arch/amd64/conf/kern.ldscript
--- a/sys/arch/amd64/conf/kern.ldscript Sun Nov 02 16:07:15 2014 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript Sun Nov 02 17:58:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.7 2014/11/01 11:58:55 uebayasi Exp $ */
+/*     $NetBSD: kern.ldscript,v 1.8 2014/11/02 17:58:14 uebayasi Exp $ */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -32,13 +32,22 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
      *(.data.cacheline_aligned)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
-     *(.data.read_mostly)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
+     *(.data.read_mostly)
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+
    _edata = . ;
    PROVIDE (edata = .) ;
    __bss_start = . ;
diff -r 0391a661d79e -r 28d7753a4795 sys/arch/amd64/conf/kern.ldscript.2MB
--- a/sys/arch/amd64/conf/kern.ldscript.2MB     Sun Nov 02 16:07:15 2014 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.2MB     Sun Nov 02 17:58:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.2MB,v 1.4 2014/11/01 11:58:55 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.2MB,v 1.5 2014/11/02 17:58:14 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -33,11 +33,18 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
      *(.data.cacheline_aligned)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
      *(.data.read_mostly)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 0391a661d79e -r 28d7753a4795 sys/arch/amd64/conf/kern.ldscript.Xen
--- a/sys/arch/amd64/conf/kern.ldscript.Xen     Sun Nov 02 16:07:15 2014 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.Xen     Sun Nov 02 17:58:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.4 2014/11/01 11:58:55 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.Xen,v 1.5 2014/11/02 17:58:14 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -26,11 +26,18 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
      *(.data.cacheline_aligned)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
      *(.data.read_mostly)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 0391a661d79e -r 28d7753a4795 sys/arch/i386/conf/kern.ldscript
--- a/sys/arch/i386/conf/kern.ldscript  Sun Nov 02 16:07:15 2014 +0000
+++ b/sys/arch/i386/conf/kern.ldscript  Sun Nov 02 17:58:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.10 2014/11/01 11:58:55 uebayasi Exp $        */
+/*     $NetBSD: kern.ldscript,v 1.11 2014/11/02 17:58:14 uebayasi Exp $        */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -32,11 +32,18 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
      *(.data.cacheline_aligned)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
      *(.data.read_mostly)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 0391a661d79e -r 28d7753a4795 sys/arch/i386/conf/kern.ldscript.4MB
--- a/sys/arch/i386/conf/kern.ldscript.4MB      Sun Nov 02 16:07:15 2014 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.4MB      Sun Nov 02 17:58:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.4MB,v 1.11 2014/11/01 11:58:55 uebayasi Exp $    */
+/*     $NetBSD: kern.ldscript.4MB,v 1.12 2014/11/02 17:58:14 uebayasi Exp $    */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -33,11 +33,18 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
      *(.data.cacheline_aligned)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
      *(.data.read_mostly)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 0391a661d79e -r 28d7753a4795 sys/arch/i386/conf/kern.ldscript.Xen
--- a/sys/arch/i386/conf/kern.ldscript.Xen      Sun Nov 02 16:07:15 2014 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.Xen      Sun Nov 02 17:58:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.5 2014/11/01 11:58:55 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.Xen,v 1.6 2014/11/02 17:58:14 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -28,11 +28,18 @@
    .data :
    {
      *(.data)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
      *(.data.cacheline_aligned)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
      *(.data.read_mostly)
-     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;



Home | Main Index | Thread Index | Old Index