Skip to content

Commit

Permalink
Merge branch 'vara-dev' into f-StaticAnalysisMotivatedSynthBenchmarks…
Browse files Browse the repository at this point in the history
…Impl
  • Loading branch information
boehmseb authored Jan 25, 2024
2 parents d054c40 + 991bb76 commit 1a5e295
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ How to set up VaRA/LLVM in CLion
--------------------------------
1. Use ``vara-buildsetup vara -i`` to correctly clone and checkout the VaRa/LLVM repos (cf. :ref:`How to setup VaRA`)

2. Start CLion and from the menu select **File | Open** and point to ``<varats_root>/vara-llvm-project/llvm/CMakeLists.txt``.
2. Start CLion and from the menu select **File | Open** and point to ``<varats_root>/tools_src/vara-llvm-project/llvm/CMakeLists.txt``.
In the dialog that opens, click **Open as Project**.

3. Go to **Settings/Preferences | Build, Execution, Deployment | CMake** to configure the CMake project.
Expand All @@ -20,8 +20,8 @@ How to set up VaRA/LLVM in CLion
-DBUILD_CLAR=OFF
-DBUILD_SHARED_LIBS=ON
-DCMAKE_C_FLAGS_DEBUG=-O2 -g -fno-omit-frame-pointer
-DCMAKE_CXX_FLAGS_DEBUG=-O2 -g -fno-omit-frame-pointer
-DCMAKE_C_FLAGS_DEBUG="-O2 -g -fno-omit-frame-pointer"
-DCMAKE_CXX_FLAGS_DEBUG="-O2 -g -fno-omit-frame-pointer"
-DCMAKE_CXX_STANDARD=17
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DCMAKE_INSTALL_PREFIX=<varats_root>/tools/VaRA
Expand Down Expand Up @@ -55,8 +55,8 @@ How to set up VaRA/LLVM in CLion
-DBUILD_CLAR=OFF
-DBUILD_SHARED_LIBS=ON
-DCMAKE_C_FLAGS_RELEASE=-O3 -DNDEBUG -march=native -fno-omit-frame-pointer -gmlt
-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DNDEBUG -march=native -fno-omit-frame-pointer -gmlt
-DCMAKE_C_FLAGS_RELEASE="-O3 -DNDEBUG -march=native -fno-omit-frame-pointer -gmlt"
-DCMAKE_CXX_FLAGS_RELEASE="-O3 -DNDEBUG -march=native -fno-omit-frame-pointer -gmlt"
-DCMAKE_CXX_STANDARD=17
-DCMAKE_INSTALL_PREFIX=<varats_root>/tools/VaRA
-DLLVM_ENABLE_ASSERTIONS=OFF
Expand Down
7 changes: 6 additions & 1 deletion varats/varats/tools/driver_casestudy.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
TypedChoice,
EnumChoice,
create_multi_case_study_choice,
ShortCommitHashParamType,
)
from varats.utils.git_util import (
get_initial_commit,
Expand Down Expand Up @@ -555,7 +556,11 @@ def __casestudy_package(
@click.option(
"--project", required=True, help="Project to view result files for."
)
@click.option("--commit-hash", help="Commit hash to view result files for.")
@click.option(
"--commit-hash",
type=ShortCommitHashParamType(),
help="Commit hash to view result files for."
)
@click.option(
"--newest-only",
is_flag=True,
Expand Down
18 changes: 17 additions & 1 deletion varats/varats/ts_utils/click_param_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import click
from benchbuild.experiment import ExperimentRegistry
from click import ParamType

from varats.data.discover_reports import initialize_reports
from varats.experiments.discover_experiments import initialize_experiments
Expand All @@ -17,6 +18,7 @@
)
from varats.ts_utils.cli_util import CLIOptionTy, convert_value, make_cli_option
from varats.utils.exceptions import ConfigurationLookupError
from varats.utils.git_util import ShortCommitHash

if tp.TYPE_CHECKING:
# pylint: disable=unused-import
Expand Down Expand Up @@ -184,8 +186,22 @@ def create_multi_experiment_type_choice(
return TypedMultiChoice(value_dict)


class ShortCommitHashParamType(ParamType):
"""Click parameter type for commit hashes."""
name = "ShortCommitHash"

def convert(
self, value: tp.Union[str, ShortCommitHash],
param: tp.Optional[click.Parameter], ctx: tp.Optional[click.Context]
) -> ShortCommitHash:
if isinstance(value, ShortCommitHash):
return value

return ShortCommitHash(value)


# ------------------------------------------------------------------------------
# Predefined CLI Options
# Predefined plot/table CLI Options
# ------------------------------------------------------------------------------

REQUIRE_CASE_STUDY: CLIOptionTy = convert_value(
Expand Down

0 comments on commit 1a5e295

Please sign in to comment.