Skip to content

Commit b9b5d23

Browse files
callumfarecallumfare
committed
Fix offload-tblgen lit tests
1 parent da03afc commit b9b5d23

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

‎offload/test/tools/offload-tblgen/default_returns.td‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
// RUN: %offload-tblgen -gen-api -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-API
2-
// RUN: %offload-tblgen -gen-entry-points -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-VALIDATION
1+
// RUN: %offload-tblgen -gen-api -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-API
2+
// RUN: %offload-tblgen -gen-entry-points -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-VALIDATION
33

44
// Check implicit returns are included in documentation and the validation
55
// wrappers where applicable
66

77
include "APIDefs.td"
88

99
def : Handle {
10-
let name = "offload_foo_handle_t";
10+
let name = "ol_foo_handle_t";
1111
let desc = "Example handle type";
1212
}
1313

@@ -17,24 +17,24 @@ def : Function {
1717
let details = [ "Function A detailed information" ];
1818
let params = [
1919
Param<"uint32_t", "ParamValue", "A plain value parameter">,
20-
Param<"offload_foo_handle_t", "ParamHandle", "A handle parameter">,
20+
Param<"ol_foo_handle_t", "ParamHandle", "A handle parameter">,
2121
Param<"uint32_t*", "ParamPointer", "A pointer parameter">,
2222
Param<"uint32_t*", "ParamPointerOpt", "An optional pointer parameter", PARAM_OUT_OPTIONAL>
2323
];
2424
let returns = [];
2525
}
2626

2727
// CHECK-API: /// @returns
28-
// CHECK-API: OFFLOAD_RESULT_SUCCESS
29-
// CHECK-API: OFFLOAD_ERRC_INVALID_NULL_HANDLE
28+
// CHECK-API: OL_RESULT_SUCCESS
29+
// CHECK-API: OL_ERRC_INVALID_NULL_HANDLE
3030
// CHECK-API-NEXT: `NULL == ParamHandle`
31-
// CHECK-API: OFFLOAD_ERRC_INVALID_NULL_POINTER
31+
// CHECK-API: OL_ERRC_INVALID_NULL_POINTER
3232
// CHECK-API-NEXT: `NULL == ParamPointer`
3333
// CHECK-API-NOT: `NULL == ParamPointerOpt`
3434

3535
// CHECK-VALIDATION: FunctionA_val
3636
// CHECK-VALIDATION: if (NULL == ParamHandle)
37-
// CHECK-VALIDATION-NEXT: return OFFLOAD_ERRC_INVALID_NULL_HANDLE;
37+
// CHECK-VALIDATION-NEXT: return OL_ERRC_INVALID_NULL_HANDLE;
3838
// CHECK-VALIDATION: if (NULL == ParamPointer)
39-
// CHECK-VALIDATION-NEXT: return OFFLOAD_ERRC_INVALID_NULL_POINTER;
39+
// CHECK-VALIDATION-NEXT: return OL_ERRC_INVALID_NULL_POINTER;
4040
// CHECK-VALIDATION-NOT: if (NULL == ParamPointerOpt)

‎offload/test/tools/offload-tblgen/entry_points.td‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %offload-tblgen -gen-entry-points -I %S/../../../new-api/API %s | %fcheck-generic
1+
// RUN: %offload-tblgen -gen-entry-points -I %S/../../../liboffload/API %s | %fcheck-generic
22

33
// Check entry point wrapper functions are generated correctly
44

@@ -13,7 +13,7 @@ def : Function {
1313
Param<"uint32_t*", "ParamB", "Parameter B description">,
1414
];
1515
let returns = [
16-
Return<"OFFLOAD_ERRC_INVALID_VALUE", ["When a value is invalid"]>
16+
Return<"OL_ERRC_INVALID_VALUE", ["When a value is invalid"]>
1717
];
1818
}
1919

@@ -22,7 +22,7 @@ def : Function {
2222
// CHECK: FunctionA_val
2323
// CHECK: return FunctionA_impl(ParamA, ParamB);
2424

25-
// CHECK: offload_result_t{{.*}} FunctionA(
25+
// CHECK: ol_result_t{{.*}} FunctionA(
2626

2727
// The entry point should print tracing output if enabled
2828
// CHECK: if (offloadConfig().TracingEnabled) {

‎offload/test/tools/offload-tblgen/functions_basic.td‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %offload-tblgen -gen-api -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-API
2-
// RUN: %offload-tblgen -gen-exports -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-EXPORTS
3-
// RUN: %offload-tblgen -gen-func-names -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-FUNC-MACRO
1+
// RUN: %offload-tblgen -gen-api -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-API
2+
// RUN: %offload-tblgen -gen-exports -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-EXPORTS
3+
// RUN: %offload-tblgen -gen-func-names -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-FUNC-MACRO
44

55
// Check basic support for API functions
66

@@ -15,18 +15,18 @@ def : Function {
1515
Param<"uint32_t*", "ParamB", "Parameter B description">,
1616
];
1717
let returns = [
18-
Return<"OFFLOAD_ERRC_INVALID_VALUE", ["When a value is invalid"]>
18+
Return<"OL_ERRC_INVALID_VALUE", ["When a value is invalid"]>
1919
];
2020
}
2121

2222
// CHECK-API: /// @brief Function A description
2323
// CHECK-API: /// @details
2424
// CHECK-API-NEXT: Function A detailed information
2525
// CHECK-API: /// @returns
26-
// CHECK-API: OFFLOAD_ERRC_INVALID_VALUE
26+
// CHECK-API: OL_ERRC_INVALID_VALUE
2727
// CHECK-API-NEXT: When a value is invalid
2828

29-
// CHECK-API: offload_result_t
29+
// CHECK-API: ol_result_t
3030
// CHECK-API-SAME: FunctionA
3131

3232
// CHECK-API: // Parameter A description

‎offload/test/tools/offload-tblgen/functions_code_loc.td‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %offload-tblgen -gen-api -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-API
2-
// RUN: %offload-tblgen -gen-exports -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-EXPORTS
3-
// RUN: %offload-tblgen -gen-func-names -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-FUNC-MACRO
1+
// RUN: %offload-tblgen -gen-api -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-API
2+
// RUN: %offload-tblgen -gen-exports -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-EXPORTS
3+
// RUN: %offload-tblgen -gen-func-names -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-FUNC-MACRO
44

55
// Check that the function variant with code location information is generated
66
// and is otherwise the same as the regular function
@@ -16,11 +16,11 @@ def : Function {
1616
Param<"uint32_t*", "ParamB", "Parameter B description">,
1717
];
1818
let returns = [
19-
Return<"OFFLOAD_ERRC_INVALID_VALUE", ["When a value is invalid"]>
19+
Return<"OL_ERRC_INVALID_VALUE", ["When a value is invalid"]>
2020
];
2121
}
2222

23-
// CHECK-API-DAG: offload_result_t{{.*}} FunctionA
24-
// CHECK-API-DAG: offload_result_t{{.*}} FunctionAWithCodeLoc
23+
// CHECK-API-DAG: ol_result_t{{.*}} FunctionA
24+
// CHECK-API-DAG: ol_result_t{{.*}} FunctionAWithCodeLoc
2525
// CHECK-EXPORTS: FunctionAWithCodeLoc
2626
// CHECK-FUNC-MACRO: OFFLOAD_FUNC(FunctionAWithCodeLoc)

‎offload/test/tools/offload-tblgen/functions_ranged_param.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %offload-tblgen -gen-print-header -I %S/../../../new-api/API %s | %fcheck-generic
1+
// RUN: %offload-tblgen -gen-print-header -I %S/../../../liboffload/API %s | %fcheck-generic
22

33
// Check that ranged function parameters are implemented correctly. These
44
// are pointers to an array of an arbitrary size. Their size is described as a

‎offload/test/tools/offload-tblgen/print_enum.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %offload-tblgen -gen-print-header -I %S/../../../new-api/API %s | %fcheck-generic
1+
// RUN: %offload-tblgen -gen-print-header -I %S/../../../liboffload/API %s | %fcheck-generic
22

33
// Check that print helpers are created for enums
44

‎offload/test/tools/offload-tblgen/print_function.td‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// RUN: %offload-tblgen -gen-print-header -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-PRINT
2-
// RUN: %offload-tblgen -gen-api -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-API
1+
// RUN: %offload-tblgen -gen-print-header -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-PRINT
2+
// RUN: %offload-tblgen -gen-api -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-API
33

44
// Check that print helpers are created for functions
55

66
include "APIDefs.td"
77

88
def : Handle {
9-
let name = "offload_foo_handle_t";
9+
let name = "ol_foo_handle_t";
1010
let desc = "Example handle type";
1111
}
1212

@@ -16,15 +16,15 @@ def : Function {
1616
let details = [ "Function A detailed information" ];
1717
let params = [
1818
Param<"uint32_t", "ParamValue", "A plain value parameter">,
19-
Param<"offload_foo_handle_t", "ParamHandle", "A handle parameter">,
19+
Param<"ol_foo_handle_t", "ParamHandle", "A handle parameter">,
2020
Param<"uint32_t*", "ParamPointer", "A pointer parameter">,
2121
];
2222
let returns = [];
2323
}
2424

2525
// CHECK-API: typedef struct function_a_params_t {
2626
// CHECK-API-NEXT: uint32_t* pParamValue;
27-
// CHECK-API-NEXT: offload_foo_handle_t* pParamHandle;
27+
// CHECK-API-NEXT: ol_foo_handle_t* pParamHandle;
2828
// CHECK-API-NEXT: uint32_t** pParamPointer;
2929

3030
// CHECK-PRINT: inline std::ostream &operator<<(std::ostream &os, const struct function_a_params_t *params)

‎offload/test/tools/offload-tblgen/type_tagged_enum.td‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %offload-tblgen -gen-api -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-API
2-
// RUN: %offload-tblgen -gen-print-header -I %S/../../../new-api/API %s | %fcheck-generic --check-prefix=CHECK-PRINT
1+
// RUN: %offload-tblgen -gen-api -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-API
2+
// RUN: %offload-tblgen -gen-print-header -I %S/../../../liboffload/API %s | %fcheck-generic --check-prefix=CHECK-PRINT
33

44
// Check that type-tagged enumerators are implemented correctly. They enable
55
// functions to return data of an arbitrary type and size via a void*, using
@@ -43,7 +43,7 @@ def : Function {
4343
Param<"size_t", "PropSize", "the number of bytes pointed to by PropValue.", PARAM_IN>,
4444
TypeTaggedParam<"void*", "PropValue", "array of bytes holding the info. "
4545
"If PropSize is not equal to or greater to the real number of bytes needed to return the info "
46-
"then the OFFLOAD_ERRC_INVALID_SIZE error is returned and PropValue is not used.", PARAM_OUT,
46+
"then the OL_ERRC_INVALID_SIZE error is returned and PropValue is not used.", PARAM_OUT,
4747
TypeInfo<"PropName" , "PropSize">>
4848
];
4949
let returns = [];

0 commit comments

Comments
 (0)