Skip to content
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

Jump to bottom

driver verify bisect #3460

Merged
merged 22 commits into from
Oct 9, 2024
Merged

driver verify bisect #3460

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2d91e1b
bisect
richagadgil Sep 18, 2024
1163662
fix bisect
richagadgil Sep 18, 2024
621ec9d
Delete src/py/argument_parser.hpp
richagadgil Sep 19, 2024
8de6073
fix alg
richagadgil Sep 19, 2024
afec549
Merge branch 'bisect' of github.com:ROCm/AMDMIGraphX into bisect
richagadgil Sep 19, 2024
35402fa
remove print
richagadgil Sep 19, 2024
125a432
refactor
richagadgil Sep 19, 2024
449d4e8
Use dominator to compute bisect
pfultz2 Sep 20, 2024
adc734a
Format
pfultz2 Sep 20, 2024
ad8960a
Use dominator differently
pfultz2 Sep 21, 2024
3fee225
Format
pfultz2 Sep 21, 2024
f4b3eed
Use critical path instead
pfultz2 Sep 21, 2024
d90b776
Format
pfultz2 Sep 21, 2024
5537f67
Refactor
pfultz2 Sep 21, 2024
794f4fc
Format
pfultz2 Sep 21, 2024
b906842
Update main.cpp
richagadgil Sep 25, 2024
7ae8223
Merge branch 'develop' into bisect
richagadgil Oct 4, 2024
9acba2d
Revert dominator changes
pfultz2 Oct 4, 2024
eb927d3
Update mlir.cpp
richagadgil Oct 4, 2024
6ced6c7
clean up
richagadgil Oct 7, 2024
c876abd
Update verify.cpp
richagadgil Oct 8, 2024
2504c5d
Merge branch 'develop' into bisect
causten Oct 8, 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
6 changes: 6 additions & 0 deletions src/driver/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ struct verify : command<verify>
std::optional<double> rtol;
bool per_instruction = false;
bool reduce = false;
bool bisect = false;
verify_options vo;
void parse(argument_parser& ap)
{
Expand All @@ -607,6 +608,7 @@ struct verify : command<verify>
ap.help("Verify each instruction"),
ap.set_value(true));
ap(reduce, {"-r", "--reduce"}, ap.help("Reduce program and verify"), ap.set_value(true));
ap(bisect, {"-b", "--bisect"}, ap.help("Bisect program and verify"), ap.set_value(true));
ap(vo.ref_use_double,
{"--ref-use-double"},
ap.help("Convert floating point values to double on ref"),
Expand Down Expand Up @@ -644,6 +646,10 @@ struct verify : command<verify>
{
verify_reduced_program(p, t, c.co, vo, m, tols);
}
else if (bisect) {
std::cout << "Bisect selected" << std::endl;
verify_bisected_program(p, t, c.co, vo, m, tols);
}
else
{
verify_program(c.l.file, p, t, c.co, vo, m, tols);
Expand Down
54 changes: 53 additions & 1 deletion src/driver/verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
return output;
}

void verify_program(const std::string& name,
bool verify_program(const std::string& name,
const program& p,
const target& t,
compile_options options,
Expand Down Expand Up @@ -144,6 +144,7 @@
}
if(passed)
std::cout << "MIGraphX verification passed successfully." << std::endl;
return passed;
}

void verify_instructions(const program& prog,
Expand Down Expand Up @@ -237,6 +238,57 @@
}
}

bool verify_bisect(program p,
int mid_n,
const target& t,
compile_options options,
verify_options vo,
const parameter_map& inputs,
verify::tolerance tols)
{
auto* mm = p.get_main_module();
auto mid = std::next(mm->begin(), mid_n);
mm->remove_instructions(mid, mm->end());
std::cout << "Verify up to: " << mid_n << std::endl;
std::cout << p << std::endl;
try
{
return verify_program(std::to_string(mid_n), p, t, options, vo, inputs, tols);
}
catch(const std::exception& e)
{
std::cout << "FAILED: " << mid_n << std::endl;
std::cout << "Exception: " << e.what() << std::endl;
return false;
}

}

void verify_bisected_program(const program& p,
const target& t,
compile_options options,
verify_options vo,
const parameter_map& inputs,
verify::tolerance tols)
{
const auto* mm = p.get_main_module();
auto right = std::distance(mm->begin(), mm->end());
std::size_t left = 0;
bool passed;

Check warning on line 277 in src/driver/verify.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

style: The scope of the variable 'passed' can be reduced. [variableScope]

std::cout << "Bisect Verify steps: " << right << std::endl;
while (left <= right) {
std::size_t mid = left + (right - left) / 2;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to skip the instructions that are const foldable.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can probably create a vector to do the mapping:

std::vector<std::size_t> trim_map;
std::size_t i = 0;
for(const auto& ins:*mm)
{
    if(not ins.can_eval())
        trim_map.push_back(i);
    i++;
}

Then do the bisection over trim_map and then use it to get the actual trim value: verify_bisect(p, trim_map[mid], t, options, vo, inputs, tols).

passed = verify_bisect(p, mid, t, options, vo, inputs, tols);
if (passed) {
left = mid + 1;
} else {
right = mid - 1;
}
}
}


} // namespace MIGRAPHX_INLINE_NS
} // namespace driver
} // namespace migraphx
8 changes: 7 additions & 1 deletion src/driver/verify.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ verify::tolerance get_tolerances(const program& p,
std::optional<double> atol,
std::optional<double> rtol);

void verify_program(const std::string& name,
bool verify_program(const std::string& name,
const program& p,
const target& t,
compile_options options = compile_options{},
Expand All @@ -56,6 +56,12 @@ void verify_reduced_program(const program& p,
verify_options vo = verify_options{},
const parameter_map& inputs = {},
verify::tolerance tols = verify::tolerance{});
void verify_bisected_program(const program& p,
const target& t,
compile_options options = compile_options{},
verify_options vo = verify_options{},
const parameter_map& inputs = {},
verify::tolerance tols = verify::tolerance{});

} // namespace MIGRAPHX_INLINE_NS
} // namespace driver
Expand Down
Loading