[mips][ias] Only round section sizes when explicitly requested.

As requested by Rafael Espindola in his post-commit comments on r268036. This
makes the previous behaviour the default while still allowing verification of
IAS.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@268496 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp b/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp
index 73b7722aa082405b4bf918d270798aa9b8e8ba01..58c1f0ee4eeda2dee559b42209f55e1be4498fe1 100644 (file)
--- a/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp
+++ b/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp
@@ -21,12 +21,19 @@
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/MCSymbolELF.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ELF.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormattedStream.h"
 
 using namespace llvm;
 
+namespace {
+static cl::opt<bool> RoundSectionSizes(
+    "mips-round-section-sizes", cl::init(false),
+    cl::desc("Round section sizes up to the section alignment"), cl::Hidden);
+} // end anonymous namespace
+
 MipsTargetStreamer::MipsTargetStreamer(MCStreamer &S)
     : MCTargetStreamer(S), ModuleDirectiveAllowed(true) {
   GPRInfoSet = FPRInfoSet = FrameInfoSet = false;
@@ -729,18 +736,23 @@ void MipsTargetELFStreamer::finish() {
   DataSection.setAlignment(std::max(16u, DataSection.getAlignment()));
   BSSSection.setAlignment(std::max(16u, BSSSection.getAlignment()));
 
-  // Make sections sizes a multiple of the alignment.
-  MCStreamer &OS = getStreamer();
-  for (MCSection &S : MCA) {
-    MCSectionELF &Section = static_cast<MCSectionELF &>(S);
-
-    unsigned Alignment = Section.getAlignment();
-    if (Alignment) {
-      OS.SwitchSection(&Section);
-      if (Section.UseCodeAlign())
-        OS.EmitCodeAlignment(Alignment, Alignment);
-      else
-        OS.EmitValueToAlignment(Alignment, 0, 1, Alignment);
+  if (RoundSectionSizes) {
+    // Make sections sizes a multiple of the alignment. This is useful for
+    // verifying the output of IAS against the output of other assemblers but
+    // it's not necessary to produce a correct object and increases section
+    // size.
+    MCStreamer &OS = getStreamer();
+    for (MCSection &S : MCA) {
+      MCSectionELF &Section = static_cast<MCSectionELF &>(S);
+
+      unsigned Alignment = Section.getAlignment();
+      if (Alignment) {
+        OS.SwitchSection(&Section);
+        if (Section.UseCodeAlign())
+          OS.EmitCodeAlignment(Alignment, Alignment);
+        else
+          OS.EmitValueToAlignment(Alignment, 0, 1, Alignment);
+      }
     }
   }
 

diff --git a/test/DebugInfo/Mips/delay-slot.ll b/test/DebugInfo/Mips/delay-slot.ll
index ee3efcaa88518231334c28260c9dc8793100a553..d441481f84a5869e0f1d38508cebde7ee10638e9 100644 (file)
--- a/test/DebugInfo/Mips/delay-slot.ll
+++ b/test/DebugInfo/Mips/delay-slot.ll
@@ -19,7 +19,7 @@
 ; CHECK: 0x000000000000002c      3      0      1   0             0  is_stmt
 ; CHECK: 0x000000000000003c      4      0      1   0             0  is_stmt
 ; CHECK: 0x0000000000000048      5      0      1   0             0  is_stmt
-; CHECK: 0x0000000000000060      5      0      1   0             0  is_stmt end_sequence
+; CHECK: 0x0000000000000058      5      0      1   0             0  is_stmt end_sequence
 
 
 target datalayout = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"

diff --git a/test/MC/Mips/section-size.s b/test/MC/Mips/section-size.s
index e8b64324a2ef52ba20d5327c4f09f640ec07af90..f6ffa8fe2de4a996c5fc7e32f0e22157821a299f 100644 (file)
--- a/test/MC/Mips/section-size.s
+++ b/test/MC/Mips/section-size.s
@@ -1,5 +1,5 @@
-# RUN: llvm-mc -triple mips-unknown-linux -filetype=obj %s | \
-# RUN:     llvm-readobj -sections | FileCheck %s
+# RUN: llvm-mc -triple mips-unknown-linux -filetype=obj \
+# RUN:     -mips-round-section-sizes %s | llvm-readobj -sections | FileCheck %s
        .section ".talign1", "ax"
        .p2align 4
 t1:    .byte 1