On Wednesday, February 4, 2015, Matt Arsenault <<a href="mailto:arsenm2@gmail.com">arsenm2@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
Would it be OK to merge this to the 3.6 branch?</blockquote><div><br></div><div>Seems fine to me. Certainly won't break anything. Hans?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
-Matt<br>
<br>
> On Feb 4, 2015, at 7:30 PM, Matt Arsenault <<a href="javascript:;" onclick="_e(event, 'cvml', 'Matthew.Arsenault@amd.com')">Matthew.Arsenault@amd.com</a>> wrote:<br>
><br>
> Author: arsenm<br>
> Date: Wed Feb 4 21:30:08 2015<br>
> New Revision: 228269<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228269&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=228269&view=rev</a><br>
> Log:<br>
> Add support for double / float to EndianStream<br>
><br>
> Also add new unit tests for endian::Writer<br>
><br>
> Added:<br>
> llvm/trunk/unittests/Support/EndianStreamTest.cpp<br>
> Modified:<br>
> llvm/trunk/include/llvm/Support/EndianStream.h<br>
> llvm/trunk/unittests/Support/CMakeLists.txt<br>
><br>
> Modified: llvm/trunk/include/llvm/Support/EndianStream.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/EndianStream.h?rev=228269&r1=228268&r2=228269&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/EndianStream.h?rev=228269&r1=228268&r2=228269&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/include/llvm/Support/EndianStream.h (original)<br>
> +++ llvm/trunk/include/llvm/Support/EndianStream.h Wed Feb 4 21:30:08 2015<br>
> @@ -31,6 +31,31 @@ template <endianness endian> struct Writ<br>
> OS.write((const char *)&Val, sizeof(value_type));<br>
> }<br>
> };<br>
> +<br>
> +template <><br>
> +template <><br>
> +inline void Writer<little>::write<float>(float Val) {<br>
> + write(FloatToBits(Val));<br>
> +}<br>
> +<br>
> +template <><br>
> +template <><br>
> +inline void Writer<little>::write<double>(double Val) {<br>
> + write(DoubleToBits(Val));<br>
> +}<br>
> +<br>
> +template <><br>
> +template <><br>
> +inline void Writer<big>::write<float>(float Val) {<br>
> + write(FloatToBits(Val));<br>
> +}<br>
> +<br>
> +template <><br>
> +template <><br>
> +inline void Writer<big>::write<double>(double Val) {<br>
> + write(DoubleToBits(Val));<br>
> +}<br>
> +<br>
> } // end namespace endian<br>
><br>
> } // end namespace support<br>
><br>
> Modified: llvm/trunk/unittests/Support/CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CMakeLists.txt?rev=228269&r1=228268&r2=228269&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CMakeLists.txt?rev=228269&r1=228268&r2=228269&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/unittests/Support/CMakeLists.txt (original)<br>
> +++ llvm/trunk/unittests/Support/CMakeLists.txt Wed Feb 4 21:30:08 2015<br>
> @@ -14,6 +14,7 @@ add_llvm_unittest(SupportTests<br>
> ConvertUTFTest.cpp<br>
> DataExtractorTest.cpp<br>
> DwarfTest.cpp<br>
> + EndianStreamTest.cpp<br>
> EndianTest.cpp<br>
> ErrorOrTest.cpp<br>
> FileOutputBufferTest.cpp<br>
><br>
> Added: llvm/trunk/unittests/Support/EndianStreamTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/EndianStreamTest.cpp?rev=228269&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/EndianStreamTest.cpp?rev=228269&view=auto</a><br>
> ==============================================================================<br>
> --- llvm/trunk/unittests/Support/EndianStreamTest.cpp (added)<br>
> +++ llvm/trunk/unittests/Support/EndianStreamTest.cpp Wed Feb 4 21:30:08 2015<br>
> @@ -0,0 +1,157 @@<br>
> +//===- unittests/Support/EndianStreamTest.cpp - EndianStream.h tests ------===//<br>
> +//<br>
> +// The LLVM Compiler Infrastructure<br>
> +//<br>
> +// This file is distributed under the University of Illinois Open Source<br>
> +// License. See LICENSE.TXT for details.<br>
> +//<br>
> +//===----------------------------------------------------------------------===//<br>
> +<br>
> +#include "llvm/ADT/SmallString.h"<br>
> +#include "llvm/Support/EndianStream.h"<br>
> +#include "llvm/Support/DataTypes.h"<br>
> +#include "gtest/gtest.h"<br>
> +using namespace llvm;<br>
> +using namespace support;<br>
> +<br>
> +namespace {<br>
> +<br>
> +TEST(EndianStream, WriteInt32LE) {<br>
> + SmallString<16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<little> LE(OS);<br>
> + LE.write(static_cast<int32_t>(-1362446643));<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xCD);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xB6);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xCA);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0xAE);<br>
> +}<br>
> +<br>
> +TEST(EndianStream, WriteInt32BE) {<br>
> + SmallVector<char, 16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<big> BE(OS);<br>
> + BE.write(static_cast<int32_t>(-1362446643));<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xAE);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xCA);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xB6);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0xCD);<br>
> +}<br>
> +<br>
> +<br>
> +TEST(EndianStream, WriteFloatLE) {<br>
> + SmallString<16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<little> LE(OS);<br>
> + LE.write(12345.0f);<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0x00);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xE4);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0x40);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x46);<br>
> +}<br>
> +<br>
> +TEST(EndianStream, WriteFloatBE) {<br>
> + SmallVector<char, 16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<big> BE(OS);<br>
> + BE.write(12345.0f);<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0x46);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0x40);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xE4);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x00);<br>
> +}<br>
> +<br>
> +TEST(EndianStream, WriteInt64LE) {<br>
> + SmallString<16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<little> LE(OS);<br>
> + LE.write(static_cast<int64_t>(-136244664332342323));<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xCD);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xAB);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xED);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x1B);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[4]), 0x33);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[5]), 0xF6);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[6]), 0x1B);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[7]), 0xFE);<br>
> +}<br>
> +<br>
> +TEST(EndianStream, WriteInt64BE) {<br>
> + SmallVector<char, 16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<big> BE(OS);<br>
> + BE.write(static_cast<int64_t>(-136244664332342323));<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xFE);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0x1B);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xF6);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x33);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[4]), 0x1B);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[5]), 0xED);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[6]), 0xAB);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[7]), 0xCD);<br>
> +}<br>
> +<br>
> +TEST(EndianStream, WriteDoubleLE) {<br>
> + SmallString<16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<little> LE(OS);<br>
> + LE.write(-2349214918.58107);<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0x20);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0x98);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0xD2);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0x98);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[4]), 0xC5);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[5]), 0x80);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[6]), 0xE1);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[7]), 0xC1);<br>
> +}<br>
> +<br>
> +TEST(EndianStream, WriteDoubleBE) {<br>
> + SmallVector<char, 16> data;<br>
> +<br>
> + {<br>
> + raw_svector_ostream OS(data);<br>
> + endian::Writer<big> BE(OS);<br>
> + BE.write(-2349214918.58107);<br>
> + }<br>
> +<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[0]), 0xC1);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[1]), 0xE1);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[2]), 0x80);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[3]), 0xC5);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[4]), 0x98);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[5]), 0xD2);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[6]), 0x98);<br>
> + EXPECT_EQ(static_cast<uint8_t>(data[7]), 0x20);<br>
> +}<br>
> +<br>
> +<br>
> +} // end anon namespace<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="javascript:;" onclick="_e(event, 'cvml', 'llvm-commits@cs.uiuc.edu')">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
</blockquote>