-
Notifications
You must be signed in to change notification settings - Fork 50
feat: add ffi::Expected<T> for exception-free error handling #399
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
292ee84
8508ce3
ad1c187
58b9af6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,234 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| /*! | ||
| * \file tvm/ffi/expected.h | ||
| * \brief Runtime Expected container type for exception-free error handling. | ||
| */ | ||
| #ifndef TVM_FFI_EXPECTED_H_ | ||
| #define TVM_FFI_EXPECTED_H_ | ||
|
|
||
| #include <tvm/ffi/any.h> | ||
| #include <tvm/ffi/error.h> | ||
|
|
||
| #include <type_traits> | ||
| #include <utility> | ||
|
|
||
| namespace tvm { | ||
| namespace ffi { | ||
|
|
||
| /*! | ||
| * \brief Expected<T> provides exception-free error handling for FFI functions. | ||
| * | ||
| * Expected<T> is similar to Rust's Result<T, Error> or C++23's std::expected. | ||
| * It can hold either a success value of type T or an error of type Error. | ||
| * | ||
| * \tparam T The success type. Must be Any-compatible and cannot be Error. | ||
| * | ||
| * Usage: | ||
| * \code | ||
| * Expected<int> divide(int a, int b) { | ||
| * if (b == 0) { | ||
| * return ExpectedErr(Error("ValueError", "Division by zero")); | ||
| * } | ||
| * return ExpectedOk(a / b); | ||
| * } | ||
| * | ||
| * Expected<int> result = divide(10, 2); | ||
| * if (result.is_ok()) { | ||
| * int value = result.value(); | ||
| * } else { | ||
| * Error err = result.error(); | ||
| * } | ||
| * \endcode | ||
| */ | ||
| template <typename T> | ||
| class Expected { | ||
| public: | ||
| static_assert(!std::is_same_v<T, Error>, "Expected<Error> is not allowed. Use Error directly."); | ||
|
|
||
| /*! | ||
| * \brief Create an Expected with a success value. | ||
| * \param value The success value. | ||
| * \return Expected containing the success value. | ||
| */ | ||
| static Expected Ok(T value) { return Expected(Any(std::move(value))); } | ||
|
|
||
| /*! | ||
| * \brief Create an Expected with an error. | ||
| * \param error The error value. | ||
| * \return Expected containing the error. | ||
| */ | ||
| static Expected Err(Error error) { return Expected(Any(std::move(error))); } | ||
|
|
||
| /*! | ||
| * \brief Check if the Expected contains a success value. | ||
| * \return True if contains success value, false if contains error. | ||
| * \note Checks for Error first to handle cases where T is a base class of Error. | ||
| */ | ||
| TVM_FFI_INLINE bool is_ok() const { return !data_.as<Error>().has_value(); } | ||
|
|
||
| /*! | ||
| * \brief Check if the Expected contains an error. | ||
| * \return True if contains error, false if contains success value. | ||
| */ | ||
| TVM_FFI_INLINE bool is_err() const { return !is_ok(); } | ||
|
|
||
| /*! | ||
| * \brief Alias for is_ok(). | ||
| * \return True if contains success value. | ||
| */ | ||
| TVM_FFI_INLINE bool has_value() const { return is_ok(); } | ||
|
|
||
| /*! \brief Access the success value. Throws the contained error if is_err(). */ | ||
| TVM_FFI_INLINE T value() const& { | ||
| if (is_err()) throw data_.cast<Error>(); | ||
| return data_.cast<T>(); | ||
| } | ||
| /*! \brief Access the success value (rvalue). Throws the contained error if is_err(). */ | ||
| TVM_FFI_INLINE T value() && { | ||
| if (is_err()) throw std::move(data_).template cast<Error>(); | ||
| return std::move(data_).template cast<T>(); | ||
| } | ||
|
|
||
| /*! \brief Access the error. Throws RuntimeError if is_ok(). */ | ||
| TVM_FFI_INLINE Error error() const& { | ||
| if (!is_err()) TVM_FFI_THROW(RuntimeError) << "Bad expected access: contains value, not error"; | ||
| return data_.cast<Error>(); | ||
| } | ||
| /*! \brief Access the error (rvalue). Throws RuntimeError if is_ok(). */ | ||
| TVM_FFI_INLINE Error error() && { | ||
| if (!is_err()) TVM_FFI_THROW(RuntimeError) << "Bad expected access: contains value, not error"; | ||
| return std::move(data_).template cast<Error>(); | ||
| } | ||
|
|
||
| /*! | ||
| * \brief Get the success value or a default value. | ||
| * \param default_value The value to return if Expected contains an error. | ||
| * \return The success value if present, otherwise the default value. | ||
| */ | ||
| template <typename U = std::remove_cv_t<T>> | ||
| TVM_FFI_INLINE T value_or(U&& default_value) const { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this function might be rarely used, because the philosophy of
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think maybe we should keep this since that is kind of standard practice std::optional and C++23 std::expected both have value_or. |
||
| if (is_ok()) { | ||
| return data_.cast<T>(); | ||
| } | ||
| return T(std::forward<U>(default_value)); | ||
| } | ||
|
|
||
| private: | ||
| friend struct TypeTraits<Expected<T>>; | ||
|
|
||
| /*! | ||
| * \brief Private constructor from Any. | ||
| * \param data The data containing either T or Error. | ||
| * \note This constructor is used by TypeTraits for conversion. | ||
| */ | ||
| explicit Expected(Any data) : data_(std::move(data)) { | ||
| TVM_FFI_ICHECK(data_.as<T>().has_value() || data_.as<Error>().has_value()) | ||
| << "Expected must contain either T or Error"; | ||
| } | ||
|
|
||
| Any data_; // Holds either T or Error | ||
| }; | ||
|
|
||
| /*! | ||
| * \brief Helper function to create Expected::Ok with type deduction. | ||
| * \tparam T The success type (deduced from argument). | ||
| * \param value The success value. | ||
| * \return Expected<T> containing the success value. | ||
| */ | ||
| template <typename T> | ||
| TVM_FFI_INLINE Expected<T> ExpectedOk(T value) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it is good to do round of API review, can you list all the APIs that are not conforming to std::expected, list their names, and discuss choice(i know some comes from rust API style, but good to be explicit). Would be good to list the APIs in the comment |
||
| return Expected<T>::Ok(std::move(value)); | ||
| } | ||
|
|
||
| /*! | ||
| * \brief Helper function to create Expected::Err. | ||
| * \tparam T The success type (must be explicitly specified). | ||
| * \param error The error value. | ||
| * \return Expected<T> containing the error. | ||
| */ | ||
| template <typename T> | ||
| TVM_FFI_INLINE Expected<T> ExpectedErr(Error error) { | ||
| return Expected<T>::Err(std::move(error)); | ||
| } | ||
|
|
||
| // TypeTraits specialization for Expected<T> | ||
| template <typename T> | ||
| inline constexpr bool use_default_type_traits_v<Expected<T>> = false; | ||
|
|
||
| template <typename T> | ||
| struct TypeTraits<Expected<T>> : public TypeTraitsBase { | ||
| TVM_FFI_INLINE static void CopyToAnyView(const Expected<T>& src, TVMFFIAny* result) { | ||
| if (src.is_err()) { | ||
| TypeTraits<Error>::CopyToAnyView(src.error(), result); | ||
| } else { | ||
| TypeTraits<T>::CopyToAnyView(src.value(), result); | ||
| } | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static void MoveToAny(Expected<T> src, TVMFFIAny* result) { | ||
| if (src.is_err()) { | ||
| TypeTraits<Error>::MoveToAny(std::move(src).error(), result); | ||
| } else { | ||
| TypeTraits<T>::MoveToAny(std::move(src).value(), result); | ||
| } | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static bool CheckAnyStrict(const TVMFFIAny* src) { | ||
| return TypeTraits<T>::CheckAnyStrict(src) || TypeTraits<Error>::CheckAnyStrict(src); | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static Expected<T> CopyFromAnyViewAfterCheck(const TVMFFIAny* src) { | ||
| if (TypeTraits<T>::CheckAnyStrict(src)) { | ||
| return Expected<T>::Ok(TypeTraits<T>::CopyFromAnyViewAfterCheck(src)); | ||
| } | ||
| return Expected<T>::Err(TypeTraits<Error>::CopyFromAnyViewAfterCheck(src)); | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static Expected<T> MoveFromAnyAfterCheck(TVMFFIAny* src) { | ||
| if (TypeTraits<T>::CheckAnyStrict(src)) { | ||
| return Expected<T>::Ok(TypeTraits<T>::MoveFromAnyAfterCheck(src)); | ||
| } | ||
| return Expected<T>::Err(TypeTraits<Error>::MoveFromAnyAfterCheck(src)); | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static std::optional<Expected<T>> TryCastFromAnyView(const TVMFFIAny* src) { | ||
| if (auto opt = TypeTraits<T>::TryCastFromAnyView(src)) { | ||
| return Expected<T>::Ok(*std::move(opt)); | ||
| } | ||
| if (auto opt_err = TypeTraits<Error>::TryCastFromAnyView(src)) { | ||
| return Expected<T>::Err(*std::move(opt_err)); | ||
| } | ||
| return std::nullopt; | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static std::string TypeStr() { | ||
| return "Expected<" + TypeTraits<T>::TypeStr() + ">"; | ||
| } | ||
|
|
||
| TVM_FFI_INLINE static std::string TypeSchema() { | ||
| return R"({"type":"Expected","args":[)" + details::TypeSchema<T>::v() + | ||
| R"(,{"type":"ffi.Error"}]})"; | ||
| } | ||
| }; | ||
|
|
||
| } // namespace ffi | ||
| } // namespace tvm | ||
| #endif // TVM_FFI_EXPECTED_H_ | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,11 @@ | |
|
|
||
| namespace tvm { | ||
| namespace ffi { | ||
|
|
||
| // Forward declaration for Expected<T> | ||
| template <typename T> | ||
| class Expected; | ||
|
|
||
| namespace details { | ||
|
|
||
| template <typename ArgType> | ||
|
|
@@ -67,6 +72,19 @@ static constexpr bool ArgSupported = | |
| std::is_same_v<std::remove_const_t<std::remove_reference_t<T>>, AnyView> || | ||
| TypeTraitsNoCR<T>::convert_enabled)); | ||
|
|
||
| template <typename T> | ||
| struct is_expected : std::false_type { | ||
| using value_type = void; | ||
| }; | ||
|
|
||
| template <typename T> | ||
| struct is_expected<Expected<T>> : std::true_type { | ||
| using value_type = T; | ||
| }; | ||
|
|
||
| template <typename T> | ||
| inline constexpr bool is_expected_v = is_expected<T>::value; | ||
|
|
||
| // NOTE: return type can only support non-reference managed returns | ||
| template <typename T> | ||
| static constexpr bool RetSupported = | ||
|
|
@@ -219,6 +237,9 @@ TVM_FFI_INLINE void unpack_call(std::index_sequence<Is...>, const std::string* o | |
| // use index sequence to do recursive-less unpacking | ||
| if constexpr (std::is_same_v<R, void>) { | ||
| f(ArgValueWithContext<std::tuple_element_t<Is, PackedArgs>>{args, Is, optional_name, f_sig}...); | ||
| } else if constexpr (is_expected_v<R>) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This behavior can be a bit confusing. If the ffi.Function is explicitly returning Expected Value (instead of throw using the error handling mechanism, then the function should successully return instead of implicitly throw when error is found? Mayb need a regression testcase for this
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i think the current design unwraps
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are two ways that Expected get returned
And there are two ways to call a function now
Would be good to discuss the overall relation in the mix of four cases
In any case, it would be good first to make sure behavior of C0 is correct, and the particular context seems to suggest C0+W1, in such case, we should return the value to the caller.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for the detailed breakdown of the four scenarios (C0/C1 + W0/W1) which really helped clarify the design considerations. Based on my understanding, the key question is about the C0 + W1 scenario (normal Call() on a function returning Expected). Here's how I see the two possible directions: Option A: Keep current behavior (auto-unwrap) // Current implementation
if (expected_result.is_ok()) {
*rv = std::move(expected_result).value(); // unwrap value
} else {
throw std::move(expected_result).error(); // throw error
}
Option B: No unwrap, return Expected directly // Proposed change
*rv = f(...); // return Expected as-is
Personally, I'd slightly lean toward Option B after @tqchen's breakdown. If a function explicitly chooses to return Expected, I think we should respect that and let the caller receive it directly. I'd like to confirm your preference before updating the implementation. Happy to add regression tests or update implementation for whichever approach we go with.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. agree option B is better
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated with option B. Please take another look, thanks! |
||
| *rv = f(ArgValueWithContext<std::tuple_element_t<Is, PackedArgs>>{args, Is, optional_name, | ||
| f_sig}...); | ||
| } else { | ||
| *rv = R(f(ArgValueWithContext<std::tuple_element_t<Is, PackedArgs>>{args, Is, optional_name, | ||
| f_sig}...)); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For large data, we can use move instead of copy, so I agree with Gemini that we can add an overload function here:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree as well. I've added both const& and && qualified overloads for value():
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually we might not need both here, @tqchen would like to hear your opinion if we wanna keep one of them