[llvm] r228269 - Add support for double / float to EndianStream

Matt Arsenault arsenm2 at gmail.com
Wed Feb 4 19:40:07 PST 2015


Hi,

Would it be OK to merge this to the 3.6 branch?

-Matt

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





More information about the llvm-commits mailing list