[cfe-commits] r59615 - in /cfe/trunk: lib/CodeGen/CGExpr.cpp lib/CodeGen/CGExprScalar.cpp lib/CodeGen/CodeGenFunction.h lib/CodeGen/README.txt test/CodeGen/bitfield-assign.c test/CodeGen/volatile.c
Daniel Dunbar
daniel at zuster.org
Wed Nov 19 01:36:46 PST 2008
Author: ddunbar
Date: Wed Nov 19 03:36:46 2008
New Revision: 59615
URL: http://llvm.org/viewvc/llvm-project?rev=59615&view=rev
Log:
Fix redundant load of bit-fields on assignment (to get the updated
value).
- Use extra argument to EmitStoreThroughLValue to provide place to
write update bit-field value if caller requires it.
- This fixes several FIXMEs.
Added:
cfe/trunk/test/CodeGen/bitfield-assign.c
Modified:
cfe/trunk/lib/CodeGen/CGExpr.cpp
cfe/trunk/lib/CodeGen/CGExprScalar.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.h
cfe/trunk/lib/CodeGen/README.txt
cfe/trunk/test/CodeGen/volatile.c
Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=59615&r1=59614&r2=59615&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Wed Nov 19 03:36:46 2008
@@ -392,7 +392,8 @@
}
void CodeGenFunction::EmitStoreThroughBitfieldLValue(RValue Src, LValue Dst,
- QualType Ty) {
+ QualType Ty,
+ llvm::Value **Result) {
unsigned StartBit = Dst.getBitfieldStartBit();
unsigned BitfieldSize = Dst.getBitfieldSize();
llvm::Value *Ptr = Dst.getBitfieldAddr();
@@ -403,12 +404,31 @@
// Get the new value, cast to the appropriate type and masked to
// exactly the size of the bit-field.
- llvm::Value *NewVal = Src.getScalarVal();
- NewVal = Builder.CreateIntCast(NewVal, EltTy, false, "tmp");
+ llvm::Value *SrcVal = Src.getScalarVal();
+ llvm::Value *NewVal = Builder.CreateIntCast(SrcVal, EltTy, false, "tmp");
llvm::Constant *Mask =
llvm::ConstantInt::get(llvm::APInt::getLowBitsSet(EltTySize, BitfieldSize));
NewVal = Builder.CreateAnd(NewVal, Mask, "bf.value");
+ // Return the new value of the bit-field, if requested.
+ if (Result) {
+ // Cast back to the proper type for result.
+ const llvm::Type *SrcTy = SrcVal->getType();
+ llvm::Value *SrcTrunc = Builder.CreateIntCast(NewVal, SrcTy, false,
+ "bf.reload.val");
+
+ // Sign extend if necessary.
+ if (Dst.isBitfieldSigned()) {
+ unsigned SrcTySize = CGM.getTargetData().getTypeSizeInBits(SrcTy);
+ llvm::Value *ExtraBits = llvm::ConstantInt::get(SrcTy,
+ SrcTySize - BitfieldSize);
+ SrcTrunc = Builder.CreateAShr(Builder.CreateShl(SrcTrunc, ExtraBits),
+ ExtraBits, "bf.reload.sext");
+ }
+
+ *Result = SrcTrunc;
+ }
+
// In some cases the bitfield may straddle two memory locations.
// Emit the low part first and check to see if the high needs to be
// done.
Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=59615&r1=59614&r2=59615&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Wed Nov 19 03:36:46 2008
@@ -786,15 +786,14 @@
// Convert the result back to the LHS type.
Result = EmitScalarConversion(Result, ResultTy, LHSTy);
- // Store the result value into the LHS lvalue.
- CGF.EmitStoreThroughLValue(RValue::get(Result), LHSLV, LHSTy);
-
- // For bitfields, we need the value in the bitfield. Note that
- // property references do not reload their value (even though the
- // setter may have changed it).
- // FIXME: This adds an extra bitfield load
+ // Store the result value into the LHS lvalue. Bit-fields are
+ // handled specially because the result is altered by the store.
if (LHSLV.isBitfield())
- Result = EmitLoadOfLValue(LHSLV, LHSTy);
+ CGF.EmitStoreThroughBitfieldLValue(RValue::get(Result), LHSLV, LHSTy,
+ &Result);
+ else
+ CGF.EmitStoreThroughLValue(RValue::get(Result), LHSLV, LHSTy);
+
return Result;
}
@@ -1003,16 +1002,14 @@
LValue LHS = EmitLValue(E->getLHS());
Value *RHS = Visit(E->getRHS());
- // Store the value into the LHS.
+ // Store the value into the LHS. Bit-fields are handled specially
+ // because the result is altered by the store.
// FIXME: Volatility!
- CGF.EmitStoreThroughLValue(RValue::get(RHS), LHS, E->getType());
-
- // For bitfields, we need the value in the bitfield. Note that
- // property references do not reload their value (even though the
- // setter may have changed it).
- // FIXME: This adds an extra bitfield load
if (LHS.isBitfield())
- return EmitLoadOfLValue(LHS, E->getLHS()->getType());
+ CGF.EmitStoreThroughBitfieldLValue(RValue::get(RHS), LHS, E->getType(),
+ &RHS);
+ else
+ CGF.EmitStoreThroughLValue(RValue::get(RHS), LHS, E->getType());
// Return the RHS.
return RHS;
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=59615&r1=59614&r2=59615&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Wed Nov 19 03:36:46 2008
@@ -32,6 +32,7 @@
class BasicBlock;
class Module;
class SwitchInst;
+ class Value;
}
namespace clang {
@@ -446,8 +447,16 @@
void EmitStoreThroughLValue(RValue Src, LValue Dst, QualType Ty);
void EmitStoreThroughExtVectorComponentLValue(RValue Src, LValue Dst,
QualType Ty);
- void EmitStoreThroughBitfieldLValue(RValue Src, LValue Dst, QualType Ty);
void EmitStoreThroughPropertyRefLValue(RValue Src, LValue Dst, QualType Ty);
+
+ /// EmitStoreThroughLValue - Store Src into Dst with same
+ /// constraints as EmitStoreThroughLValue.
+ ///
+ /// \param Result [out] - If non-null, this will be set to a Value*
+ /// for the bit-field contents after the store, appropriate for use
+ /// as the result of an assignment to the bit-field.
+ void EmitStoreThroughBitfieldLValue(RValue Src, LValue Dst, QualType Ty,
+ llvm::Value **Result=0);
// Note: only availabe for agg return types
LValue EmitBinaryOperatorLValue(const BinaryOperator *E);
Modified: cfe/trunk/lib/CodeGen/README.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/README.txt?rev=59615&r1=59614&r2=59615&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/README.txt (original)
+++ cfe/trunk/lib/CodeGen/README.txt Wed Nov 19 03:36:46 2008
@@ -17,8 +17,3 @@
directly.
//===---------------------------------------------------------------------===//
-
-Bitfields should not reload the stored value just to return the
-correct result.
-
-//===---------------------------------------------------------------------===//
Added: cfe/trunk/test/CodeGen/bitfield-assign.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/bitfield-assign.c?rev=59615&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/bitfield-assign.c (added)
+++ cfe/trunk/test/CodeGen/bitfield-assign.c Wed Nov 19 03:36:46 2008
@@ -0,0 +1,44 @@
+/* Check that the result of a bitfield assignment is properly
+ truncated and does not generate a redundant load. */
+
+/* Check that we get one load for each simple assign and two for the
+ compound assign (load the old value before the add then load again
+ to store back). Also check that our g0 pattern is good. */
+// RUN: clang -O0 -emit-llvm -o %t %s &&
+// RUN: grep 'load ' %t | count 5 &&
+// RUN: grep "@g0" %t | count 4 &&
+
+// Check that we got the right value.
+// RUN: clang -O3 -emit-llvm -o %t %s &&
+// RUN: grep 'load ' %t | count 0 &&
+// RUN: grep "@g0" %t | count 0
+
+struct s0 {
+ int f0 : 2;
+ _Bool f1 : 1;
+ unsigned f2 : 2;
+};
+
+int g0();
+
+void f0(void) {
+ struct s0 s;
+ if ((s.f0 = 3) != -1) g0();
+}
+
+void f1(void) {
+ struct s0 s;
+ if ((s.f1 = 3) != 1) g0();
+}
+
+void f2(void) {
+ struct s0 s;
+ if ((s.f2 = 3) != 3) g0();
+}
+
+void f3(void) {
+ struct s0 s;
+ // Just check this one for load counts.
+ s.f0 += 3;
+}
+
Modified: cfe/trunk/test/CodeGen/volatile.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/volatile.c?rev=59615&r1=59614&r2=59615&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/volatile.c (original)
+++ cfe/trunk/test/CodeGen/volatile.c Wed Nov 19 03:36:46 2008
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep volatile | count 26
+// RUN: clang -emit-llvm < %s | grep volatile | count 25
// The number 26 comes from the current codegen for volatile loads;
// if this number changes, it's not necessarily something wrong, but
@@ -76,7 +76,7 @@
vpF2->x=i;
vF3.x.y=i;
BF.x=i;
- vBF.x=i; // FIXME: This generates an extra volatile load
+ vBF.x=i;
V[3]=i;
vV[3]=i;
More information about the cfe-commits
mailing list