Skip to content

fix cfg generator spelling of pbtext extension #16

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix cfg generator spelling of pbtext extension #16

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
67c9541
fix cfg generator spelling of pbtext extension
jty2 Nov 3, 2020
eb75462
source_generator: use Makefile variables for compiler and linker flags
jty2 Nov 3, 2020
c821b63
source_generator: default to -O2 optimization
jty2 Nov 3, 2020
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: 2 additions & 2 deletions frontend/src/frontend/cfg_generator/generate_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def main():
ichase_gen.register_args(subparsers)
dfs_chase_gen.register_args(subparsers)
parser.add_argument('output_filename',
default='/tmp/cfg.pbtxt',
default='/tmp/cfg.pbtext',
help='Output textproto file location.')
args = parser.parse_args()

Expand All @@ -34,7 +34,7 @@ def main():
else:
raise ValueError('Invalid CFG type: %s' % args.cfg_type)

if args.output_filename.endswith('.pbtxt'):
if args.output_filename.endswith('.pbtext'):
with open(args.output_filename, 'w') as f:
f.write(str(cfg))
elif args.output_filename.endswith('.pb'):
Expand Down
17 changes: 13 additions & 4 deletions frontend/src/frontend/code_generator/source_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,21 @@ def write_makefile(self, function_files: Collection[str]) -> None:
dependencies = self.get_object_files_to_c_files_mapping(
function_files)
obj_files = ' '.join(dependencies.keys())
string = (f'{self.benchmark_name}: {obj_files}\n'
f'\tgcc -o {self.benchmark_name} {obj_files} -O0\n\n')

string = (f'OBJS={obj_files}\n'
f'CFLAGS=-O2\n'
f'#CFLAGS=-O2 -fcf-protection=none\n'
f'LDFLAGS=\n'
f'CC=gcc\n\n')

string += (f'{self.benchmark_name}: $(OBJS)\n'
f'\t$(CC) -o $@ $^ $(LDFLAGS)\n\n')

for obj_file, c_file in dependencies.items():
string += f'{obj_file}: {c_file}\n'
string += f'\tgcc -c -o {obj_file} {c_file} -O0\n\n'
string += f'clean:\n\trm *.o {self.benchmark_name}\n'
string += f'\t$(CC) -c -o $@ $^ $(CFLAGS)\n\n'

string += f'\nclean:\n\trm -f $(OBJS) {self.benchmark_name}\n'
f.write(string)

def get_object_files_to_c_files_mapping(
Expand Down