[llvm-commits] [llvm] r167620 - in /llvm/trunk: include/llvm/Target/TargetOptions.h lib/Target/ARM/ARMFastISel.cpp lib/Target/ARM/ARMISelLowering.cpp
Chad Rosier
mcrosier at apple.com
Fri Nov 9 09:29:38 PST 2012
Author: mcrosier
Date: Fri Nov 9 11:29:38 2012
New Revision: 167620
URL: http://llvm.org/viewvc/llvm-project?rev=167620&view=rev
Log:
Add support for -mstrict-align compiler option for ARM targets.
rdar://12340498
Modified:
llvm/trunk/include/llvm/Target/TargetOptions.h
llvm/trunk/lib/Target/ARM/ARMFastISel.cpp
llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
Modified: llvm/trunk/include/llvm/Target/TargetOptions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetOptions.h?rev=167620&r1=167619&r2=167620&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetOptions.h (original)
+++ llvm/trunk/include/llvm/Target/TargetOptions.h Fri Nov 9 11:29:38 2012
@@ -48,10 +48,10 @@
UseSoftFloat(false), NoZerosInBSS(false), JITExceptionHandling(false),
JITEmitDebugInfo(false), JITEmitDebugInfoToDisk(false),
GuaranteedTailCallOpt(false), DisableTailCalls(false),
- StackAlignmentOverride(0), RealignStack(true), EnableFastISel(false),
- PositionIndependentExecutable(false), EnableSegmentedStacks(false),
- UseInitArray(false), TrapFuncName(""), FloatABIType(FloatABI::Default),
- AllowFPOpFusion(FPOpFusion::Standard)
+ StackAlignmentOverride(0), RealignStack(true), StrictAlign(false),
+ EnableFastISel(false), PositionIndependentExecutable(false),
+ EnableSegmentedStacks(false), UseInitArray(false), TrapFuncName(""),
+ FloatABIType(FloatABI::Default), AllowFPOpFusion(FPOpFusion::Standard)
{}
/// PrintMachineCode - This flag is enabled when the -print-machineinstrs
@@ -155,6 +155,10 @@
/// automatically realigned, if needed.
unsigned RealignStack : 1;
+ /// StrictAlign - This flag indicates that all memory accesses must be
+ /// aligned. (ARM only)
+ unsigned StrictAlign : 1;
+
/// SSPBufferSize - The minimum size of buffers that will receive stack
/// smashing protection when -fstack-protection is used.
unsigned SSPBufferSize;
Modified: llvm/trunk/lib/Target/ARM/ARMFastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMFastISel.cpp?rev=167620&r1=167619&r2=167620&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMFastISel.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMFastISel.cpp Fri Nov 9 11:29:38 2012
@@ -1028,7 +1028,8 @@
RC = &ARM::GPRRegClass;
break;
case MVT::i16:
- if (Alignment && Alignment < 2 && !Subtarget->allowsUnalignedMem())
+ if (Alignment && Alignment < 2 && (!Subtarget->allowsUnalignedMem() ||
+ TM.Options.StrictAlign))
return false;
if (isThumb2) {
@@ -1043,7 +1044,8 @@
RC = &ARM::GPRRegClass;
break;
case MVT::i32:
- if (Alignment && Alignment < 4 && !Subtarget->allowsUnalignedMem())
+ if (Alignment && Alignment < 4 && (!Subtarget->allowsUnalignedMem() ||
+ TM.Options.StrictAlign))
return false;
if (isThumb2) {
@@ -1152,7 +1154,8 @@
}
break;
case MVT::i16:
- if (Alignment && Alignment < 2 && !Subtarget->allowsUnalignedMem())
+ if (Alignment && Alignment < 2 && (!Subtarget->allowsUnalignedMem() ||
+ TM.Options.StrictAlign))
return false;
if (isThumb2) {
@@ -1166,7 +1169,8 @@
}
break;
case MVT::i32:
- if (Alignment && Alignment < 4 && !Subtarget->allowsUnalignedMem())
+ if (Alignment && Alignment < 4 && (!Subtarget->allowsUnalignedMem() ||
+ TM.Options.StrictAlign))
return false;
if (isThumb2) {
Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=167620&r1=167619&r2=167620&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Fri Nov 9 11:29:38 2012
@@ -9119,7 +9119,8 @@
bool ARMTargetLowering::allowsUnalignedMemoryAccesses(EVT VT) const {
// The AllowsUnaliged flag models the SCTLR.A setting in ARM cpus
- bool AllowsUnaligned = Subtarget->allowsUnalignedMem();
+ bool AllowsUnaligned = Subtarget->allowsUnalignedMem() &&
+ !getTargetMachine().Options.StrictAlign;
switch (VT.getSimpleVT().SimpleTy) {
default:
More information about the llvm-commits
mailing list