diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-07-14 10:42:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-14 10:42:31 +0200 |
commit | 0a38c6b813cd118e7aab833699a2c8547d1c8e14 (patch) | |
tree | d8e5fd52c92cb974dded54b486bb951bbd67855b /eval | |
parent | bf480e663efe4e7390285d624a7b383de66a1a10 (diff) |
Revert "- Pack data closer to let config fit in 2 cache lines instead of 4."
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/vespa/eval/eval/value_type.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eval/src/vespa/eval/eval/value_type.h b/eval/src/vespa/eval/eval/value_type.h index 5c0d9e3317d..49f88edb2f9 100644 --- a/eval/src/vespa/eval/eval/value_type.h +++ b/eval/src/vespa/eval/eval/value_type.h @@ -25,13 +25,13 @@ public: : name(name_in), size(npos) {} Dimension(const vespalib::string &name_in, size_type size_in) noexcept : name(name_in), size(size_in) {} - bool operator==(const Dimension &rhs) const noexcept { + bool operator==(const Dimension &rhs) const { return ((name == rhs.name) && (size == rhs.size)); } - bool operator!=(const Dimension &rhs) const noexcept { return !(*this == rhs); } - bool is_mapped() const noexcept { return (size == npos); } - bool is_indexed() const noexcept { return (size != npos); } - bool is_trivial() const noexcept { return (size == 1); } + bool operator!=(const Dimension &rhs) const { return !(*this == rhs); } + bool is_mapped() const { return (size == npos); } + bool is_indexed() const { return (size != npos); } + bool is_trivial() const { return (size == 1); } }; private: @@ -39,10 +39,10 @@ private: CellType _cell_type; std::vector<Dimension> _dimensions; - ValueType() noexcept + ValueType() : _error(true), _cell_type(CellType::DOUBLE), _dimensions() {} - ValueType(CellType cell_type_in, std::vector<Dimension> &&dimensions_in) noexcept + ValueType(CellType cell_type_in, std::vector<Dimension> &&dimensions_in) : _error(false), _cell_type(cell_type_in), _dimensions(std::move(dimensions_in)) {} static ValueType error_if(bool has_error, ValueType else_type); @@ -57,7 +57,7 @@ public: CellMeta cell_meta() const { return {_cell_type, is_double()}; } bool is_error() const { return _error; } bool is_double() const; - bool has_dimensions() const noexcept { return !_dimensions.empty(); } + bool has_dimensions() const { return !_dimensions.empty(); } bool is_sparse() const; bool is_dense() const; bool is_mixed() const; @@ -70,12 +70,12 @@ public: std::vector<Dimension> mapped_dimensions() const; size_t dimension_index(const vespalib::string &name) const; std::vector<vespalib::string> dimension_names() const; - bool operator==(const ValueType &rhs) const noexcept { + bool operator==(const ValueType &rhs) const { return ((_error == rhs._error) && (_cell_type == rhs._cell_type) && (_dimensions == rhs._dimensions)); } - bool operator!=(const ValueType &rhs) const noexcept { return !(*this == rhs); } + bool operator!=(const ValueType &rhs) const { return !(*this == rhs); } ValueType map() const; ValueType reduce(const std::vector<vespalib::string> &dimensions_in) const; |