Skip to content

Commit

Permalink
Removed the stepping slicer (#774)
Browse files Browse the repository at this point in the history
  • Loading branch information
EagleoutIce authored May 7, 2024
2 parents 3a2084c + 89642bb commit 9a95a8a
Show file tree
Hide file tree
Showing 25 changed files with 80 additions and 638 deletions.
4 changes: 2 additions & 2 deletions src/core/pipeline-executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import type {
PipelineStepNames,
PipelineStepOutputWithName
} from './steps/pipeline'
import type { PipelineStepName } from './steps/step'
import { PipelineStepStage } from './steps/step'
import type { PipelineStepName } from './steps/pipeline-step'
import { PipelineStepStage } from './steps/pipeline-step'

/**
* The pipeline executor allows to execute arbitrary {@link Pipeline|pipelines} in a step-by-step fashion.
Expand Down
2 changes: 1 addition & 1 deletion src/core/print/print.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IPipelineStep, StepProcessingFunction } from '../steps/step'
import type { IPipelineStep, StepProcessingFunction } from '../steps/pipeline-step'
import type { TailOfArray } from '../../util/arrays'
import { guard } from '../../util/assert'

Expand Down
182 changes: 0 additions & 182 deletions src/core/stepping-slicer.ts

This file was deleted.

154 changes: 0 additions & 154 deletions src/core/steps.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/core/steps/all/core/00-parse.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { internalPrinter, StepOutputFormat } from '../../../print/print'
import { parseToQuads } from '../../../print/parse-printer'
import type { IPipelineStep } from '../../step'
import { PipelineStepStage } from '../../step'
import type { IPipelineStep } from '../../pipeline-step'
import { PipelineStepStage } from '../../pipeline-step'
import type { RParseRequest, RShell } from '../../../../r-bridge'
import type { DeepReadonly } from 'ts-essentials'
import type { RShellExecutor } from '../../../../r-bridge/shell-executor'
Expand Down
4 changes: 2 additions & 2 deletions src/core/steps/all/core/10-normalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
printNormalizedAstToMermaid,
printNormalizedAstToMermaidUrl
} from '../../../print/normalize-printer'
import type { IPipelineStep } from '../../step'
import { PipelineStepStage } from '../../step'
import type { IPipelineStep } from '../../pipeline-step'
import { PipelineStepStage } from '../../pipeline-step'
import type { DeepReadonly } from 'ts-essentials'
import type { ParseRequiredInput } from './00-parse'
import { normalize } from '../../../../r-bridge/lang-4.x/ast/parser/json/parser'
Expand Down
4 changes: 2 additions & 2 deletions src/core/steps/all/core/20-dataflow.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { internalPrinter, StepOutputFormat } from '../../../print/print'
import type { IPipelineStep } from '../../step'
import { PipelineStepStage } from '../../step'
import type { IPipelineStep } from '../../pipeline-step'
import { PipelineStepStage } from '../../pipeline-step'
import {
dataflowGraphToJson,
dataflowGraphToMermaid,
Expand Down
4 changes: 2 additions & 2 deletions src/core/steps/all/core/21-abstract-interpretation.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { internalPrinter, StepOutputFormat } from '../../../print/print'
import type { DataflowInformation } from '../../../../dataflow/info'
import type { IPipelineStep } from '../../step'
import type { IPipelineStep } from '../../pipeline-step'
import type { DeepReadonly } from 'ts-essentials'
import { PipelineStepStage } from '../../step'
import { PipelineStepStage } from '../../pipeline-step'

// Use runAbstractInterpretation here when it's ready
function processor(results: { dataflow?: DataflowInformation }, _input: unknown): DataflowInformation {
Expand Down
Loading

2 comments on commit 9a95a8a

@github-actions
Copy link

Choose a reason for hiding this comment

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

"artificial" Benchmark Suite

Benchmark suite Current: 9a95a8a Previous: 1e5ddeb Ratio
Retrieve AST from R code 301.9454313181818 ms 305.50355490909095 ms 0.99
Normalize R AST 33.98642936363637 ms 33.04192136363636 ms 1.03
Produce dataflow information 66.26840077272728 ms 66.58585145454545 ms 1.00
Total per-file 1531.2451345454544 ms 1512.547620909091 ms 1.01
Static slicing 1.3741289527945397 ms (1.2429084179614327) 1.3817132831241319 ms (1.27303105869458) 0.99
Reconstruct code 0.4569137850837342 ms (0.2612516444619516) 0.45135141022522257 ms (0.25927254974160097) 1.01
Total per-slice 1.845060818026527 ms (1.308093435858884) 1.8475447304133532 ms (1.3326721674469058) 1.00
failed to reconstruct/re-parse 0 # 0 # 1
times hit threshold 0 # 0 # 1
reduction (characters) 0.7329390759026897 # 0.7329390759026897 # 1
reduction (normalized tokens) 0.7209834969577295 # 0.7209834969577295 # 1

This comment was automatically generated by workflow using github-action-benchmark.

@github-actions
Copy link

Choose a reason for hiding this comment

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

"social-science" Benchmark Suite

Benchmark suite Current: 9a95a8a Previous: 1e5ddeb Ratio
Retrieve AST from R code 298.74549412 ms 330.55613118 ms 0.90
Normalize R AST 33.9872512 ms 36.10837608 ms 0.94
Produce dataflow information 177.94035556 ms 188.6117503 ms 0.94
Total per-file 3573.56536242 ms 3858.78617088 ms 0.93
Static slicing 8.304739740294057 ms (14.45570804765856) 8.763488287471356 ms (15.142795018273485) 0.95
Reconstruct code 0.45146691836474545 ms (0.216564203337379) 0.6295735167403027 ms (0.28826473087031307) 0.72
Total per-slice 8.764739053356507 ms (14.563111184349669) 9.403718790030862 ms (15.25727767695505) 0.93
failed to reconstruct/re-parse 7 # 7 # 1
times hit threshold 298 # 298 # 1
reduction (characters) 0.8935817303062389 # 0.8935817303062389 # 1
reduction (normalized tokens) 0.8531248144961375 # 0.8531248144961375 # 1

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.