Skip to content

Fix metadirective and allocator parser regressions #48

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.

Sign up for GitHub

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
ouankou merged 2 commits into from
Apr 2, 2026
Merged

Fix metadirective and allocator parser regressions #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aedbab5
Fix metadirective and allocator parser regressions
ouankou Apr 1, 2026
49e3ec4
Fix uses_allocators state reset and local test library loading
ouankou Apr 2, 2026
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
4 changes: 4 additions & 0 deletions src/OpenMPIRToString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,10 @@ std::string OpenMPDirective::generatePragmaString(std::string prefix,
}
result += " ";
goto default_case;
} else if (paired != nullptr &&
paired->getKind() == OMPD_begin_metadirective) {
result += "metadirective ";
goto default_case;
} else if (paired != nullptr) {
result += paired->generatePragmaString("", "", "");
goto default_case;
Expand Down
60 changes: 36 additions & 24 deletions src/ompparser.yy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ static int thirdParameter = 0;
static int schedule_clause_line = 0;
static int schedule_clause_column = 0;
static OpenMPUsesAllocatorsClauseAllocator usesAllocator;
static const char *firstStringParameter = "";
static const char *secondStringParameter = "";
static std::string firstStringParameter;
static std::string secondStringParameter;
static const char *reduction_modifier_expression = nullptr;
OpenMPClauseSeparator current_expr_separator = OMPC_CLAUSE_SEP_space;
OpenMPClauseSeparator current_apply_transform_separator = OMPC_CLAUSE_SEP_comma;
Expand Down Expand Up @@ -700,7 +700,6 @@ fortran_paired_directive : parallel_directive
| parallel_sections_directive
| parallel_single_directive
| do_paired_directive
| metadirective_directive
| begin_metadirective_directive
| master_directive
| masked_directive
Expand Down Expand Up @@ -775,9 +774,21 @@ end_directive : END { current_directive = makeDirectiveAt<OpenMPEndDirective>(@1
}
;

end_clause_seq : fortran_paired_directive
end_clause_seq : end_metadirective_directive
| fortran_paired_directive
;

end_metadirective_directive : METADIRECTIVE {
// END METADIRECTIVE closes the structured BEGIN
// METADIRECTIVE block form, not the statement-associated
// METADIRECTIVE directive.
current_directive =
makeDirectiveAt<OpenMPDirective>(@1.first_line,
@1.first_column,
OMPD_begin_metadirective);
}
;

ompx_directive : OMPX {
current_directive =
makeDirectiveAt<OpenMPDirective>(@1.first_line,
Expand Down Expand Up @@ -2950,24 +2961,24 @@ defaultmap_category : CATEGORY_SCALAR { current_clause = addClauseAt(current_dir
| CATEGORY_ALL { current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column, OMPC_defaultmap,firstParameter,OMPC_DEFAULTMAP_CATEGORY_all); }
| CATEGORY_ALLOCATABLE { if (user_set_lang == Lang_Fortran || auto_lang == Lang_Fortran) {current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column, OMPC_defaultmap,firstParameter,OMPC_DEFAULTMAP_CATEGORY_allocatable);} else { yyerror("Defaultmap clause does not support allocatable in C/C++."); YYABORT;} }
;
uses_allocators_clause : USES_ALLOCATORS { current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column, OMPC_uses_allocators); firstParameter = OMPC_USESALLOCATORS_ALLOCATOR_unspecified; firstStringParameter = ""; secondStringParameter = ""; } '(' uses_allocators_parameter ')' ;
uses_allocators_clause : USES_ALLOCATORS { current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column, OMPC_uses_allocators); firstParameter = OMPC_USESALLOCATORS_ALLOCATOR_unspecified; firstStringParameter.clear(); secondStringParameter.clear(); } '(' uses_allocators_parameter ')' ;
uses_allocators_parameter : allocators_list
| allocators_list ',' uses_allocators_parameter
;

allocators_list : TRAITS '(' EXPR_STRING ')' ':' EXPR_STRING {
usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_unspecified;
firstStringParameter = $3;
secondStringParameter = $6;
firstStringParameter = $3 ? $3 : "";
secondStringParameter = $6 ? $6 : "";
((OpenMPUsesAllocatorsClause*)current_clause)
->addUsesAllocatorsAllocatorSequence(
usesAllocator, firstStringParameter,
secondStringParameter);
}
| allocators_list_parameter_enum { firstStringParameter = ""; ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_enum '(' EXPR_STRING ')' { firstStringParameter = $3; ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_user { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_user; firstStringParameter = ""; ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_user '(' EXPR_STRING ')' { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_user; firstStringParameter = $3; ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_enum { firstStringParameter.clear(); secondStringParameter.clear(); ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_enum '(' EXPR_STRING ')' { firstStringParameter = $3 ? $3 : ""; secondStringParameter.clear(); ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_user { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_user; firstStringParameter.clear(); ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
| allocators_list_parameter_user '(' EXPR_STRING ')' { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_user; firstStringParameter = $3 ? $3 : ""; ((OpenMPUsesAllocatorsClause*)current_clause)->addUsesAllocatorsAllocatorSequence(usesAllocator, firstStringParameter, secondStringParameter); }
;

allocators_list_parameter_enum : DEFAULT_MEM_ALLOC { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_default; }
Expand All @@ -2979,7 +2990,7 @@ allocators_list_parameter_enum : DEFAULT_MEM_ALLOC { usesAllocator = OMPC_USESAL
| PTEAM_MEM_ALLOC { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_pteam; }
| THREAD_MEM_ALLOC { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_thread; }
;
allocators_list_parameter_user : EXPR_STRING { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_unspecified; secondStringParameter = $1; }
allocators_list_parameter_user : EXPR_STRING { usesAllocator = OMPC_USESALLOCATORS_ALLOCATOR_unspecified; secondStringParameter = $1 ? $1 : ""; }
;
to_clause: TO { current_expr_separator = OMPC_CLAUSE_SEP_space; } '(' to_parameter ')' ;
to_parameter : EXPR_STRING { current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column, OMPC_to, OMPC_TO_unspecified); static_cast<OpenMPToClause*>(current_clause)->addItem($1); }
Expand Down Expand Up @@ -3064,21 +3075,22 @@ map_clause : MAP {
secondParameter = OMPC_MAP_MODIFIER_unspecified;
thirdParameter = OMPC_MAP_MODIFIER_unspecified;
map_ref_modifier_parameter = OMPC_MAP_REF_MODIFIER_unspecified;
firstStringParameter.clear();
current_expr_separator = OMPC_CLAUSE_SEP_space;
}'(' map_parameter')';

map_parameter : EXPR_STRING {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_unspecified, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
static_cast<OpenMPMapClause *>(current_clause)->addItem($1);
}
| EXPR_STRING ',' {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_unspecified, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
current_expr_separator = OMPC_CLAUSE_SEP_comma;
static_cast<OpenMPMapClause *>(current_clause)->addItem($1);
} map_var_list
Expand Down Expand Up @@ -3146,7 +3158,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_to, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3155,7 +3167,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_from, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3164,7 +3176,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_tofrom, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3173,7 +3185,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_storage, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3182,7 +3194,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_alloc, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3191,7 +3203,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_release, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3200,7 +3212,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_delete, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3209,7 +3221,7 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_present, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
Expand All @@ -3218,13 +3230,13 @@ map_type : MAP_TYPE_TO {
current_clause = addClauseAt(current_directive, @1.first_line, @1.first_column,
OMPC_map, firstParameter, secondParameter, thirdParameter,
OMPC_MAP_TYPE_self, map_ref_modifier_parameter,
firstStringParameter);
firstStringParameter.c_str());
if (hasMapIteratorModifier()) {
addMapIteratorDefinition(current_clause, &map_iterator_args);
}
}
;
map_modifier_mapper : MAP_MODIFIER_MAPPER '('EXPR_STRING')' { firstStringParameter = $3; }
map_modifier_mapper : MAP_MODIFIER_MAPPER '('EXPR_STRING')' { firstStringParameter = $3 ? $3 : ""; }
;
map_modifier_iterator : MAP_MODIFIER_ITERATOR {
firstParameter = OMPC_MAP_MODIFIER_iterator;
Expand Down
22 changes: 18 additions & 4 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ enable_testing()

add_compile_options(-Wall)

set(OMPPARSER_TEST_LD_LIBRARY_PATH
"LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ompparser>:$ENV{LD_LIBRARY_PATH}")

add_executable(tester
tester.cpp)
add_dependencies(tester ompparser)
Expand All @@ -23,7 +26,9 @@ add_dependencies(test_locations ompparser)
target_link_libraries(test_locations ompparser)

add_test(NAME builtin_location_fields
COMMAND $<TARGET_FILE:test_locations>
COMMAND ${CMAKE_COMMAND} -E env
"${OMPPARSER_TEST_LD_LIBRARY_PATH}"
$<TARGET_FILE:test_locations>
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

# Register built-in .txt test files as CTest tests
Expand All @@ -32,7 +37,9 @@ list(SORT TEST_SUITE_FILES)
foreach(TEST_FILE IN LISTS TEST_SUITE_FILES)
get_filename_component(TEST_NAME "${TEST_FILE}" NAME_WE)
add_test(NAME builtin_${TEST_NAME}
COMMAND $<TARGET_FILE:tester> "${TEST_FILE}"
COMMAND ${CMAKE_COMMAND} -E env
"${OMPPARSER_TEST_LD_LIBRARY_PATH}"
$<TARGET_FILE:tester> "${TEST_FILE}"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
endforeach()

Expand All @@ -52,7 +59,9 @@ foreach(TEST_FILE IN LISTS OPENMP_VV_FILES)
file(RELATIVE_PATH TEST_REL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/openmp_vv" "${TEST_FILE}")
string(REPLACE "/" "_" TEST_NAME "${TEST_REL_PATH}")
add_test(NAME openmp_vv_${TEST_NAME}
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_single_pragma.sh" "${TEST_FILE}" "$<TARGET_FILE:omp_roundtrip>"
COMMAND ${CMAKE_COMMAND} -E env
"${OMPPARSER_TEST_LD_LIBRARY_PATH}"
"${CMAKE_CURRENT_SOURCE_DIR}/test_single_pragma.sh" "${TEST_FILE}" "$<TARGET_FILE:omp_roundtrip>"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
endforeach()

Expand All @@ -72,12 +81,17 @@ foreach(TEST_FILE IN LISTS OPENMP_EXAMPLES_FILES)
file(RELATIVE_PATH TEST_REL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/openmp_examples" "${TEST_FILE}")
string(REPLACE "/" "_" TEST_NAME "${TEST_REL_PATH}")
add_test(NAME openmp_examples_${TEST_NAME}
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_single_pragma.sh" "${TEST_FILE}" "$<TARGET_FILE:omp_roundtrip>"
COMMAND ${CMAKE_COMMAND} -E env
"${OMPPARSER_TEST_LD_LIBRARY_PATH}"
"${CMAKE_CURRENT_SOURCE_DIR}/test_single_pragma.sh" "${TEST_FILE}" "$<TARGET_FILE:omp_roundtrip>"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
endforeach()

set(executable_targets tester omp_roundtrip test_locations)

set_target_properties(${executable_targets} PROPERTIES
BUILD_RPATH "$ORIGIN/..")

install(TARGETS ${executable_targets} OPTIONAL
RUNTIME DESTINATION bin
)
Loading