Skip to content

fix(vfproj): add missing VFFortranCompilerTool flags #152

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

Open
john-kohout-e2g wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(vfproj): add missing VFFortranCompilerTool flags #152

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
e6b04d8
fix(vfproj): add Qsave/save and Qzero/zero support
john-kohout-e2g Apr 25, 2024
9c15875
fix(vfproj): add align, heap-arrays, zero, parallel, and opt-prefetch…
john-kohout-e2g May 1, 2024
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
101 changes: 100 additions & 1 deletion cmake_converter/visual_studio/vfproj/flags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ def __init__(self):
('VFFortranCompilerTool_DisableSpecificDiagnostics',
self.__set_disable_specific_diagnostics),
('VFFortranCompilerTool_Diagnostics', self.__set_diagnostics),
('VFFortranCompilerTool_CommonElementAlignment', self.__set_common_element_align),
('VFFortranCompilerTool_ArrayAlignment', self.__set_default_array_align),
('VFFortranCompilerTool_AlignSEQUENCE', self.__set_sequence_type_align),
('VFFortranCompilerTool_HeapArrays', self.__set_heap_arrays),
('VFFortranCompilerTool_LocalSavedScalarsZero', self.__set_local_saved_scalars_zero),
('VFFortranCompilerTool_Parallelization', self.__set_parallelization),
('VFFortranCompilerTool_PrefetchInsertionOpt', self.__set_prefetch_insertion_opt),
('VFFortranCompilerTool_WarnDeclarations', self.__set_warn_declarations),
('VFFortranCompilerTool_WarnUnusedVariables', self.__set_warn_unused_variables),
('VFFortranCompilerTool_WarnIgnoreLOC', self.__set_warn_ignore_loc),
Expand All @@ -71,6 +78,7 @@ def __init__(self):
('VFFortranCompilerTool_RealKIND', self.__set_real_kind),
('VFFortranCompilerTool_LocalVariableStorage', self.__set_local_variable_storage),
('VFFortranCompilerTool_InitLocalVarToNAN', self.__set_init_local_var_to_nan),
('VFFortranCompilerTool_LocalSavedScalarsZero', self.__set_init_local_var_to_zero),
('VFFortranCompilerTool_FloatingPointExceptionHandling',
self.__set_floating_point_exception_handling),
('VFFortranCompilerTool_ExtendSinglePrecisionConstants',
Expand Down Expand Up @@ -176,7 +184,8 @@ def apply_flags_to_context(self, context):
ifort_ln_unix,
'assume_args',
'warn_args',
'check_args'
'check_args',
'align_args'
]

for flag_name in self.flags_handlers:
Expand All @@ -191,6 +200,7 @@ def apply_flags_to_context(self, context):

self.__set_spec_options(context, 'assume_args', 'assume')
self.__set_spec_options(context, 'check_args', 'check')
self.__set_spec_options(context, 'align_args', 'align')
self.__set_spec_options(context, 'warn_args', 'warn')

@staticmethod
Expand Down Expand Up @@ -267,6 +277,79 @@ def __set_diagnostics(context, flag_name, flag_value):
}
return flag_values

@staticmethod
def __set_common_element_align(context, flag_name, flag_value):
del context, flag_name, flag_value
flag_values = {
'alignCommonFourBytes' : {'align_args': 'commons'},
'alignCommonEightBytes': {'align_args': 'dcommons'},
'alignCommon16Bytes': {'align_args': 'qcommons'},
'alignCommon32Bytes': {'align_args': 'zcommons'},
}
return flag_values

@staticmethod
def __set_default_array_align(context, flag_name, flag_value):
del context, flag_name, flag_value
flag_values = {
'alignArray8Bytes' : {'align_args': 'array8byte'},
'alignArray16Bytes': {'align_args': 'array16byte'},
'alignArray32Bytes': {'align_args': 'array32byte'},
'alignArray64Bytes': {'align_args': 'array64byte'},
'alignArray128Bytes': {'align_args': 'array128byte'},
'alignArray256Bytes': {'align_args': 'array256byte'},
}
return flag_values

@staticmethod
def __set_sequence_type_align(context, flag_name, flag_value):
del context, flag_name, flag_value
flag_values = {
'true': {'align_args': 'sequence'}
}
return flag_values

def __set_heap_arrays(self, context, flag_name, flag_value):
del context
# value must be a list with ',' separator
opt = flag_value
if opt:
self.flags[flag_name][ifort_cl_win] = ['-heap-arrays:{}'.format(opt)]
self.flags[flag_name][ifort_cl_unix] = ['-heap-arrays={}'.format(opt)]

@staticmethod
def __set_local_saved_scalars_zero(context, flag_name, flag_value):
del context, flag_name, flag_value
flag_values = {
'true': {ifort_cl_win: '-Qzero',
ifort_cl_unix: '-zero'},
'false': {},
default_value: {}
}
return flag_values

@staticmethod
def __set_parallelization(context, flag_name, flag_value):
del context, flag_name, flag_value
flag_values = {
'true': {ifort_cl_win: '-Qparallel',
ifort_cl_unix: '-parallel'},
'false': {},
default_value: {}
}
return flag_values

@staticmethod
def __set_prefetch_insertion_opt(context, flag_name, flag_value):
del context, flag_name, flag_value
flag_values = {
'prefetchMinimum': {ifort_cl_win: '-Qopt-prefetch:1', ifort_cl_unix: '-qopt-prefetch=1'},
'prefetchMedium': {ifort_cl_win: '-Qopt-prefetch:2', ifort_cl_unix: '-qopt-prefetch=2'},
'prefetchAggresive': {ifort_cl_win: '-Qopt-prefetch:3', ifort_cl_unix: '-qopt-prefetch=3'},
default_value: {}
}
return flag_values

@staticmethod
def __set_warn_declarations(context, flag_name, flag_value):
del context, flag_name, flag_value
Expand Down Expand Up @@ -658,6 +741,20 @@ def __set_init_local_var_to_nan(context, flag_name, flag_value):
}
return flag_values

@staticmethod
def __set_init_local_var_to_zero(context, flag_name, flag_value):
"""
Set init local var to Zero flag
"""
del context, flag_name, flag_value
flag_values = {
'true': {ifort_cl_win: '-Qzero',
ifort_cl_unix: '-zero'},
default_value: {}
}
return flag_values


@staticmethod
def __set_preprocess_source_file(context, flag_name, flag_value):
"""
Expand Down Expand Up @@ -828,6 +925,8 @@ def __set_local_variable_storage(context, flag_name, flag_value):
flag_values = {
'localStorageAutomatic': {ifort_cl_win: '-Qauto',
ifort_cl_unix: '-auto'},
'localStorageSave': {ifort_cl_win: '-Qsave',
ifort_cl_unix: '-save'},
default_value: {}
}
return flag_values
Expand Down
6 changes: 6 additions & 0 deletions cmake_converter/visual_studio/vfproj/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ def get_attribute_handlers_dict(self, context):
'VFFortranCompilerTool_WarnUnalignedData': self.__parse_concrete_diagnostics,
'VFFortranCompilerTool_WarnUncalled': self.__parse_concrete_diagnostics,
'VFFortranCompilerTool_SuppressUsageMessages': self.__parse_concrete_diagnostics,
'VFFortranCompilerTool_CommonElementAlign': self.__parse_align_value,
'VFFortranCompilerTool_ArrayAlign': self.__parse_align_value,
'VFFortranCompilerTool_AlignSEQUENCE': self.__parse_align_value,
'VFFortranCompilerTool_RuntimeChecks': self.__parse_runtime_checks,
'VFFortranCompilerTool_NullPointerCheck': self.__parse_concrete_runtime_checks,
'VFFortranCompilerTool_BoundsCheck': self.__parse_concrete_runtime_checks,
Expand Down Expand Up @@ -235,6 +238,9 @@ def __parse_concrete_runtime_checks(self, context, attr_name, attr_value, node):
if self.common_runtime_checks_value is None:
context.flags.set_flag(context, attr_name, attr_value, node)

def __parse_align_value(self, context, attr_name, attr_value, node):
context.flags.set_flag(context, attr_name, attr_value, node)

def __parse_files(self, context, filter_node):
context.files.init_file_lists_for_include_paths(context)
self._parse_nodes(context, filter_node)
Expand Down
1 change: 1 addition & 0 deletions cmake_converter/visual_studio/vfproj/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ def init_context_current_setting(self, context):
context.settings[context.current_setting]['check_args'] = []
context.settings[context.current_setting]['target_type'] = 'Application'
context.settings[context.current_setting]['Fortran_MODULE_DIRECTORY'] = []
context.settings[context.current_setting]["align_args"] = []