Skip to content

[Offload] Fix broken tablegen test after #140879 #141796

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

Merged
merged 1 commit into from
May 28, 2025

Conversation

RossBrunton
Copy link
Contributor

No description provided.

@llvmbot
Copy link
Member

llvmbot commented May 28, 2025

@llvm/pr-subscribers-offload

Author: Ross Brunton (RossBrunton)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/141796.diff

2 Files Affected:

  • (modified) offload/test/tools/offload-tblgen/default_returns.td (+2-2)
  • (modified) offload/test/tools/offload-tblgen/entry_points.td (+1-1)
diff --git a/offload/test/tools/offload-tblgen/default_returns.td b/offload/test/tools/offload-tblgen/default_returns.td
index 995e24abf707d..e919492cc5bf3 100644
--- a/offload/test/tools/offload-tblgen/default_returns.td
+++ b/offload/test/tools/offload-tblgen/default_returns.td
@@ -34,7 +34,7 @@ def : Function {
 
 // CHECK-VALIDATION: FunctionA_val
 // CHECK-VALIDATION: if (NULL == ParamHandle)
-// CHECK-VALIDATION-NEXT: return OL_ERRC_INVALID_NULL_HANDLE;
+// CHECK-VALIDATION-NEXT: return createOffloadError(error::ErrorCode::INVALID_NULL_HANDLE, "validation failure: NULL == ParamHandle");
 // CHECK-VALIDATION: if (NULL == ParamPointer)
-// CHECK-VALIDATION-NEXT: return OL_ERRC_INVALID_NULL_POINTER;
+// CHECK-VALIDATION-NEXT: return createOffloadError(error::ErrorCode::INVALID_NULL_POINTER, "validation failure: NULL == ParamPointer");
 // CHECK-VALIDATION-NOT: if (NULL == ParamPointerOpt)
diff --git a/offload/test/tools/offload-tblgen/entry_points.td b/offload/test/tools/offload-tblgen/entry_points.td
index cfddb84aa5b03..c69650c2cff1b 100644
--- a/offload/test/tools/offload-tblgen/entry_points.td
+++ b/offload/test/tools/offload-tblgen/entry_points.td
@@ -28,7 +28,7 @@ def : Function {
 // CHECK: if (offloadConfig().TracingEnabled) {
 // CHECK-NEXT: "---> FunctionA";
 
-// CHECK: Result = FunctionA_val(ParamA, ParamB);
+// CHECK: Result = llvmErrorToOffloadError(FunctionA_val(ParamA, ParamB));
 
 // Tracing should construct a param struct for printing
 // CHECK: if (offloadConfig().TracingEnabled) {

@jhuber6 jhuber6 merged commit a1191b4 into llvm:main May 28, 2025
11 checks passed
@mgorny
Copy link
Member

mgorny commented May 28, 2025

Thanks! I can confirm that with the patch applied, tests pass.

sivan-shani pushed a commit to sivan-shani/llvm-project that referenced this pull request Jun 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants