Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[f2dace/dev, fortran] 1) Add declarations only to the specification-part. 2) Simplified a a + 0 expression into just a #1898

Draft
wants to merge 3 commits into
base: f2dace/dev
Choose a base branch
from
Draft

[f2dace/dev, fortran] 1) Add declarations only to the specification-part. 2) Simplified a a + 0 expression into just a #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
013cea3
Simplify expression.
pratyai Jan 18, 2025
5cf9bd4
Give IfExtractor unique temp names, and before even starting, set the
pratyai Jan 22, 2025
fd0a003
Add the declarations in the specification whenever possible.
pratyai Jan 22, 2025
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
34 changes: 28 additions & 6 deletions dace/frontend/fortran/ast_internal_classes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,23 @@ class Generic_Binding_Node(FNode):


class Specification_Part_Node(FNode):
_fields = ('specifications', 'symbols', 'interface_blocks', 'typedecls', 'enums',)
def __init__(self,
specifications: List[FNode],
symbols: List[FNode],
interface_blocks: List[FNode],
typedecls: List[FNode],
enums: List[FNode],
uses: List[FNode],
**kwargs):
super().__init__(**kwargs)
self.specifications = specifications
self.symbols = symbols
self.interface_blocks = interface_blocks
self.typedecls = typedecls
self.enums = enums
self.uses = uses

_fields = ('specifications', 'symbols', 'interface_blocks', 'typedecls', 'enums', 'uses')


class Stop_Stmt_Node(FNode):
Expand All @@ -353,6 +369,10 @@ class Error_Stmt_Node(FNode):


class Execution_Part_Node(FNode):
def __init__(self, execution: List[FNode], **kwargs):
super().__init__(**kwargs)
self.execution = execution

_fields = ('execution',)


Expand Down Expand Up @@ -656,12 +676,14 @@ class Map_Stmt_Node(For_Stmt_Node):


class If_Stmt_Node(FNode):
def __init__(self, cond:FNode, body:Optional[FNode] = None, body_else:Optional[FNode] = None, **kwargs):
super().__init__(**kwargs)
self.cond = cond
self.body = body
self.body_else = body_else

_attributes = ()
_fields = (
'cond',
'body',
'body_else',
)
_fields = ('cond', 'body', 'body_else')


class Defer_Shape_Node(FNode):
Expand Down
97 changes: 43 additions & 54 deletions dace/frontend/fortran/ast_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,11 +960,11 @@ def visit_Function_Subprogram_Node(self, node: ast_internal_classes.Function_Sub
else:
node.specification_part = ast_internal_classes.Specification_Part_Node(
specifications=[stmt_node],
symbols=None,
interface_blocks=None,
uses=None,
typedecls=None,
enums=None
symbols=[],
interface_blocks=[],
typedecls=[],
enums=[],
uses=[],
)

# We should always be able to tell a functions return _variable_ (i.e., not type, which we also should be able
Expand Down Expand Up @@ -1404,7 +1404,7 @@ def visit_Execution_Part_Node(self, node: ast_internal_classes.Execution_Part_No
else:
tmp_name = "tmp_index_" + str(temp)
temp = temp + 1
newbody.append(
node.parent.specification_part.specifications.append(
ast_internal_classes.Decl_Stmt_Node(vardecl=[
ast_internal_classes.Var_Decl_Node(name=tmp_name,
type="INTEGER",
Expand Down Expand Up @@ -2194,7 +2194,7 @@ def par_Decl_Range_Finder(node: ast_internal_classes.Array_Subscript_Node,

rangepos.append(currentindex)
if declaration:
newbody.append(
node.parent.specification_part.specifications.append(
ast_internal_classes.Decl_Stmt_Node(vardecl=[
ast_internal_classes.Symbol_Decl_Node(
name="tmp_parfor_" + str(count + len(rangepos) - 1), type="INTEGER", sizes=None, init=None,
Expand Down Expand Up @@ -2304,42 +2304,42 @@ class IfConditionExtractor(NodeTransformer):
Ensures that each loop iterator is unique by extracting the actual iterator and assigning it to a uniquely named local variable
"""

def __init__(self):
def __init__(self, program: ast_internal_classes.Program_Node):
self.count = 0

ParentScopeAssigner().visit(program)

def visit_Execution_Part_Node(self, node: ast_internal_classes.Execution_Part_Node):
newbody = []
for child in node.execution:

if isinstance(child, ast_internal_classes.If_Stmt_Node):
old_cond = child.cond
newbody.append(
ast_internal_classes.Decl_Stmt_Node(vardecl=[
ast_internal_classes.Var_Decl_Node(
name="_if_cond_" + str(self.count), type="INTEGER", sizes=None, init=None)
]))
newbody.append(ast_internal_classes.BinOp_Node(
lval=ast_internal_classes.Name_Node(name="_if_cond_" + str(self.count)),
op="=",
rval=old_cond,
line_number=child.line_number,
parent=child.parent))
newcond = ast_internal_classes.BinOp_Node(
lval=ast_internal_classes.Name_Node(name="_if_cond_" + str(self.count)),
op="==",
rval=ast_internal_classes.Int_Literal_Node(value="1"),
line_number=child.line_number, parent=old_cond.parent)
newifbody = self.visit(child.body)
newelsebody = self.visit(child.body_else)

newif = ast_internal_classes.If_Stmt_Node(cond=newcond, body=newifbody, body_else=newelsebody,
line_number=child.line_number, parent=child.parent)
self.count += 1

newbody.append(newif)

else:
if not isinstance(child, ast_internal_classes.If_Stmt_Node):
newbody.append(self.visit(child))
continue

tmpname = TempName.get_name('_if_cond_')
node.parent.specification_part.specifications.append(
ast_internal_classes.Decl_Stmt_Node(vardecl=[
ast_internal_classes.Var_Decl_Node(
name=tmpname, type="INTEGER", sizes=None, init=None,
line_number=node.line_number, parent=node.parent)]))
newbody.append(
ast_internal_classes.BinOp_Node(
lval=ast_internal_classes.Name_Node(name=tmpname), op="=", rval=child.cond,
line_number=child.line_number, parent=child.parent))
newcond = ast_internal_classes.BinOp_Node(
lval=ast_internal_classes.Name_Node(name=tmpname),
op="==",
rval=ast_internal_classes.Int_Literal_Node(value="1"),
line_number=child.line_number, parent=node.parent)
newifbody = self.visit(child.body)
newelsebody = self.visit(child.body_else)

newif = ast_internal_classes.If_Stmt_Node(
cond=newcond, body=newifbody, body_else=newelsebody,
line_number=child.line_number, parent=child.parent)
self.count += 1

newbody.append(newif)
return ast_internal_classes.Execution_Part_Node(execution=newbody)


Expand All @@ -2358,7 +2358,7 @@ def visit_Execution_Part_Node(self, node: ast_internal_classes.Execution_Part_No
newbody.append(self.visit(child))
continue
if isinstance(child, ast_internal_classes.For_Stmt_Node):
newbody.append(
node.parent.specification_part.specifications.append(
ast_internal_classes.Decl_Stmt_Node(vardecl=[
ast_internal_classes.Symbol_Decl_Node(
name="_for_it_" + str(self.count), type="INTEGER", sizes=None, init=None)
Expand Down Expand Up @@ -2430,7 +2430,7 @@ def visit_Execution_Part_Node(self, node: ast_internal_classes.Execution_Part_No
if not arrays:
newbody.append(self.visit(child))
else:
newbody.append(
node.parent.specification_part.specifications.append(
ast_internal_classes.Decl_Stmt_Node(vardecl=[
ast_internal_classes.Var_Decl_Node(
name="_for_elem_it_" + str(self.count), type="INTEGER", sizes=None, init=None)
Expand Down Expand Up @@ -2997,7 +2997,8 @@ def visit_Specification_Part_Node(self, node: ast_internal_classes.Specification
symbols=new_symbols,
typedecls=node.typedecls,
uses=node.uses,
enums=node.enums
enums=node.enums,
interface_blocks=[],
)


Expand Down Expand Up @@ -3545,21 +3546,9 @@ def visit_ParDecl_Node(self, node: ast_internal_classes.ParDecl_Node):
if r is None:
new_ranges.append(r)
else:
# lower_boundary - offset + 1
# we add +1 because offset normalization is applied later on
# lower_boundary - offset
new_ranges.append(
ast_internal_classes.BinOp_Node(
op='+',
lval=ast_internal_classes.Int_Literal_Node(value="0"),
rval=ast_internal_classes.BinOp_Node(
op='-',
lval=r,
rval=self.current_offset,
type=r.type
),
type=r.type
)
)
ast_internal_classes.BinOp_Node(op='-', lval=r, rval=self.current_offset, type=r.type))

node = ast_internal_classes.ParDecl_Node(
type='RANGE',
Expand Down
2 changes: 1 addition & 1 deletion dace/frontend/fortran/fortran_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,7 +2586,7 @@ def run_ast_transformations(own_ast: ast_components.InternalFortranAst, program:
#program = ast_transforms.StructConstructorToFunctionCall(
# ast_transforms.FindFunctionAndSubroutines.from_node(program).names).visit(program)
#program = ast_transforms.CallToArray(ast_transforms.FindFunctionAndSubroutines.from_node(program)).visit(program)
program = ast_transforms.IfConditionExtractor().visit(program)
program = ast_transforms.IfConditionExtractor(program).visit(program)
program = ast_transforms.CallExtractor(program).visit(program)

program = ast_transforms.FunctionCallTransformer().visit(program)
Expand Down