Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 24 additions & 94 deletions src/common/transformations/src/transformations/convert_precision.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "itt.hpp"
#include "openvino/core/graph_util.hpp"
#include "openvino/core/rt_info/weightless_caching_attributes.hpp"
#include "openvino/core/type/element_iterator.hpp"
#include "openvino/op/ops.hpp"
#include "openvino/pass/constant_folding.hpp"
#include "openvino/pass/manager.hpp"
Expand Down Expand Up @@ -1266,102 +1267,31 @@ void convert_lp_value(const SRC& src,
std::shared_ptr<Node> convert_low_precisions_int(std::shared_ptr<ov::op::v0::Constant>& constant,
ov::element::Type to) {
// Supported integer precisions
static const precisions_set_t supported_integer_precisions = {ov::element::i4, ov::element::u4, ov::element::u1};
// Get source element type and source data
static const precisions_set_t supported_integer_precisions = {ov::element::i4,
ov::element::u4,
ov::element::u1,
ov::element::u2};
auto src_type = constant->get_element_type();
const auto* src_data = reinterpret_cast<const uint8_t*>(constant->get_data_ptr());

// We support conversion only if several elements can be represented in one instance of some
// C++ common data type without any exception, destination data type should be bigger than
// source and destination data type should be real
if (!supported_integer_precisions.count(src_type) || (src_type.size() * 8) % src_type.bitwidth() ||
(to.size() * 8) % to.bitwidth() || to.is_real() || to.bitwidth() < src_type.bitwidth())
OPENVINO_THROW("Convert low precision for " + constant->get_element_type().get_type_name() + " to " +
to.get_type_name() + " is not implemented!");

// Create a new constant operation and get destination data
auto new_constant = std::make_shared<ov::op::v0::Constant>(to, constant->get_shape());
auto* dst_data = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(new_constant->get_data_ptr()));
// Check pointers
if (src_data == nullptr || dst_data == nullptr)
OPENVINO_THROW("Can't get data pointer");

// Convert values
const auto size = shape_size(constant->get_shape());
size_t src_idx(0), dst_idx(0), dst_off(0), src_off(0);
if (src_type.bitwidth() < 8) {
src_off = 8 - src_type.bitwidth();
}

if (to.bitwidth() < 8) {
dst_off = 8 - to.bitwidth();
}

for (size_t i = 0; i < size; i++) {
// Source type at the current moment always less than 1 byte
// Select the right destination type
switch (to.size()) {
case 1:
convert_lp_value<uint8_t, uint8_t>(src_data[src_idx],
dst_data[dst_idx],
src_off,
src_type.bitwidth(),
dst_off,
to.bitwidth(),
src_type.is_signed());
break;
case 2:
convert_lp_value<uint8_t, uint16_t>(src_data[src_idx],
reinterpret_cast<uint16_t*>(dst_data)[dst_idx],
src_off,
src_type.bitwidth(),
dst_off,
to.bitwidth(),
src_type.is_signed());
break;
case 4:
convert_lp_value<uint8_t, uint32_t>(src_data[src_idx],
reinterpret_cast<uint32_t*>(dst_data)[dst_idx],
src_off,
src_type.bitwidth(),
dst_off,
to.bitwidth(),
src_type.is_signed());
break;
case 8:
convert_lp_value<uint8_t, uint64_t>(src_data[src_idx],
reinterpret_cast<uint64_t*>(dst_data)[dst_idx],
src_off,
src_type.bitwidth(),
dst_off,
to.bitwidth(),
src_type.is_signed());
break;
default:
OPENVINO_THROW("Unsupported element size!");
}
// Calculate offsets and indexes
if (src_type.bitwidth() < 8) {
if (src_off == 0) {
src_off = 8;
src_idx++;
}
src_off -= src_type.bitwidth();
} else {
src_idx++;
}
if (to.bitwidth() < 8) {
if (dst_off == 0) {
dst_off = 8;
dst_idx++;
}
dst_off -= to.bitwidth();
} else {
dst_idx++;
}
}

return new_constant;
// Validate conversion is supported
if (!supported_integer_precisions.count(src_type) || to.is_real() || to.bitwidth() < src_type.bitwidth()) {
OPENVINO_THROW("Convert low precision for ",
src_type.get_type_name(),
" to ",
to.get_type_name(),
" is not implemented!");
}

// Use Convert operator's evaluate() to perform conversion
// This ensures consistent nibble packing order (LSB-first) with element::iterator
auto outputs = ov::TensorVector{{to, constant->get_shape()}};
OPENVINO_ASSERT(ov::op::v0::Convert(constant, to).evaluate(outputs, {constant->get_tensor_view()}),
"Failed to convert constant from ",
src_type.get_type_name(),
" to ",
to.get_type_name());

return std::make_shared<ov::op::v0::Constant>(std::move(outputs[0]));
}

} // namespace
Expand Down
54 changes: 27 additions & 27 deletions src/common/transformations/tests/utils/convert_precision.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1598,110 +1598,110 @@ TEST(TransformationTests, ConvertPrecision_ConstantConversion_BoolToU8) {
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToI8) {
constant_convert_test<uint8_t, int8_t>(element::u4, element::i8, std::vector<uint8_t>{171}, {10, 11});
constant_convert_test<uint8_t, int8_t>(element::u4, element::i8, std::vector<uint8_t>{171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToU8) {
constant_convert_test<uint8_t, uint8_t>(element::u4, element::u8, {171}, {10, 11});
constant_convert_test<uint8_t, uint8_t>(element::u4, element::u8, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToI8_2) {
constant_convert_test<uint8_t, int8_t>(element::u4, element::i8, {96}, {6, 0});
constant_convert_test<uint8_t, int8_t>(element::u4, element::i8, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToU8_96) {
constant_convert_test<uint8_t, uint8_t>(element::u4, element::u8, {96}, {6, 0});
constant_convert_test<uint8_t, uint8_t>(element::u4, element::u8, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU8) {
constant_convert_test<uint8_t, uint8_t>(element::i4, element::u8, {96}, {6, 0});
constant_convert_test<uint8_t, uint8_t>(element::i4, element::u8, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI8) {
constant_convert_test<uint8_t, int8_t>(element::i4, element::i8, {96}, {6, 0});
constant_convert_test<uint8_t, int8_t>(element::i4, element::i8, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU8_neg) {
constant_convert_test<uint8_t, uint8_t>(element::i4, element::u8, {171}, {250, 251});
constant_convert_test<uint8_t, uint8_t>(element::i4, element::u8, {171}, {251, 250});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI8_neg) {
constant_convert_test<uint8_t, int8_t>(element::i4, element::i8, {171}, {-6, -5});
constant_convert_test<uint8_t, int8_t>(element::i4, element::i8, {171}, {-5, -6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToI32) {
constant_convert_test<uint8_t, int32_t>(element::u4, element::i32, {171}, {10, 11});
constant_convert_test<uint8_t, int32_t>(element::u4, element::i32, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToU32) {
constant_convert_test<uint8_t, uint32_t>(element::u4, element::u32, {171}, {10, 11});
constant_convert_test<uint8_t, uint32_t>(element::u4, element::u32, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU32) {
constant_convert_test<uint8_t, uint32_t>(element::i4, element::u32, {96}, {6, 0});
constant_convert_test<uint8_t, uint32_t>(element::i4, element::u32, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI32) {
constant_convert_test<uint8_t, int32_t>(element::i4, element::i32, {96}, {6, 0});
constant_convert_test<uint8_t, int32_t>(element::i4, element::i32, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU32_neg) {
constant_convert_test<uint8_t, uint32_t>(element::i4, element::u32, {171}, {4294967290, 4294967291});
constant_convert_test<uint8_t, uint32_t>(element::i4, element::u32, {171}, {4294967291, 4294967290});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI32_neg) {
constant_convert_test<uint8_t, int32_t>(element::i4, element::i32, {171}, {-6, -5});
constant_convert_test<uint8_t, int32_t>(element::i4, element::i32, {171}, {-5, -6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToI16) {
constant_convert_test<uint8_t, int16_t>(element::u4, element::i16, {171}, {10, 11});
constant_convert_test<uint8_t, int16_t>(element::u4, element::i16, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToU16) {
constant_convert_test<uint8_t, uint16_t>(element::u4, element::u16, {171}, {10, 11});
constant_convert_test<uint8_t, uint16_t>(element::u4, element::u16, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU16) {
constant_convert_test<uint8_t, uint16_t>(element::i4, element::u16, {96}, {6, 0});
constant_convert_test<uint8_t, uint16_t>(element::i4, element::u16, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI16) {
constant_convert_test<uint8_t, int16_t>(element::i4, element::i16, {96}, {6, 0});
constant_convert_test<uint8_t, int16_t>(element::i4, element::i16, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU16_neg) {
constant_convert_test<uint8_t, uint16_t>(element::i4, element::u16, {171}, {65530, 65531});
constant_convert_test<uint8_t, uint16_t>(element::i4, element::u16, {171}, {65531, 65530});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI16_neg) {
constant_convert_test<uint8_t, int16_t>(element::i4, element::i16, {171}, {-6, -5});
constant_convert_test<uint8_t, int16_t>(element::i4, element::i16, {171}, {-5, -6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToI64) {
constant_convert_test<uint8_t, int64_t>(element::u4, element::i64, {171}, {10, 11});
constant_convert_test<uint8_t, int64_t>(element::u4, element::i64, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U4ToU64) {
constant_convert_test<uint8_t, int64_t>(element::u4, element::u64, {171}, {10, 11});
constant_convert_test<uint8_t, int64_t>(element::u4, element::u64, {171}, {11, 10});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU64) {
constant_convert_test<uint8_t, uint64_t>(element::i4, element::u64, {96}, {6, 0});
constant_convert_test<uint8_t, uint64_t>(element::i4, element::u64, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI64) {
constant_convert_test<uint8_t, int64_t>(element::i4, element::i64, {96}, {6, 0});
constant_convert_test<uint8_t, int64_t>(element::i4, element::i64, {96}, {0, 6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToU64_neg) {
constant_convert_test<uint8_t, uint64_t>(element::i4,
element::u64,
{171},
{18446744073709551610u, 18446744073709551611u});
{18446744073709551611u, 18446744073709551610u});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_I4ToI64_neg) {
constant_convert_test<uint8_t, int64_t>(element::i4, element::i64, {171}, {-6, -5});
constant_convert_test<uint8_t, int64_t>(element::i4, element::i64, {171}, {-5, -6});
}

TEST(TransformationTests, ConvertPrecision_ConstantConversion_U1ToU8) {
Expand All @@ -1712,7 +1712,7 @@ TEST(TransformationTests, ConvertPrecision_ConstantConversion_U1ToU4) {
constant_convert_test<uint8_t, uint8_t>(element::u1,
element::u4,
std::vector<uint8_t>{171},
{0, 1, 0, 1, 0, 1, 1, 1});
{1, 0, 1, 0, 1, 0, 1, 1});
}

TEST(TransformationTests, ConvertPrecision_keep_precission_sensitive_fp32_with_exp) {
Expand Down
Loading