Page MenuHomeFreeBSD
Differential D16761

Ensure that makewhatis is built during bootstrap-tools stage
ClosedPublic
Actions

Authored by arichardson on Aug 17 2018, 8:35 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 1:14 PM
Unknown Object (File)
Tue, Mar 18, 11:54 AM
Unknown Object (File)
Sun, Mar 16, 3:18 PM
Unknown Object (File)
Feb 16 2025, 2:50 PM
Unknown Object (File)
Feb 10 2025, 1:09 AM
Unknown Object (File)
Feb 9 2025, 12:00 PM
Unknown Object (File)
Feb 2 2025, 7:57 PM
Unknown Object (File)
Dec 10 2024, 4:15 AM
View All 47 Files
Subscribers
imp

Details

Reviewers
jhb
emaste
bdrewery
Commits
rS365584: Ensure that the makewhatis symlink is added in the bootstrap-tools stage
Summary

We currently set MK_MAN=no in $BSARGS so MK_MAN_UTILS will also be false
and we always fall back to using makewhatis from $PATH.
I found this because I am currently trying to build without inheriting the
current users $PATH.

Test Plan

makewhatis now exists in $WORLDTMP and installcheck no longer complains if I build without inheriting $PATH

Diff Detail

Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 18884
Build 18538: arc lint + arc unit

Revision Contents
Changeset List

PathSize
2 lines
usr.bin/
mandoc/
2 lines

Diff 46824

View Options

Makefile.inc1

Show First 20 Lines • Show All 254 Lines • ▼ Show 20 Lines
ucf_get_config(int cpu, int ri, struct pmc **ppm) ucf_get_config(int cpu, int ri, struct pmc **ppm)
{ {
*ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc; *ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
return (0); return (0);
} }
static int static int
ucf_read_pmc(int cpu, int ri, pmc_value_t *v) ucf_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v)
{ {
struct pmc *pm;
pmc_value_t tmp; pmc_value_t tmp;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucf_npmc, KASSERT(ri >= 0 && ri < uncore_ucf_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
pm = uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu %d ri %d(%d) pmc not configured", __LINE__, cpu,
ri, ri + uncore_ucf_ri));
tmp = rdmsr(UCF_CTR0 + ri); tmp = rdmsr(UCF_CTR0 + ri);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
*v = ucf_perfctr_value_to_reload_count(tmp); *v = ucf_perfctr_value_to_reload_count(tmp);
else else
*v = tmp; *v = tmp;
PMCDBG3(MDP,REA,1, "ucf-read cpu=%d ri=%d -> v=%jx", cpu, ri, *v); PMCDBG3(MDP,REA,1, "ucf-read cpu=%d ri=%d -> v=%jx", cpu, ri, *v);
Show All 13 Linesucf_release_pmc(int cpu, int ri, struct pmc *pmc)
KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc == NULL, KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc == NULL,
("[uncore,%d] PHW pmc non-NULL", __LINE__)); ("[uncore,%d] PHW pmc non-NULL", __LINE__));
return (0); return (0);
} }
static int static int
ucf_start_pmc(int cpu, int ri) ucf_start_pmc(int cpu, int ri, struct pmc *pm)
{ {
struct pmc *pm;
struct uncore_cpu *ucfc; struct uncore_cpu *ucfc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal CPU value %d", __LINE__, cpu)); ("[uncore,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucf_npmc, KASSERT(ri >= 0 && ri < uncore_ucf_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
PMCDBG2(MDP,STA,1,"ucf-start cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STA,1,"ucf-start cpu=%d ri=%d", cpu, ri);
ucfc = uncore_pcpu[cpu]; ucfc = uncore_pcpu[cpu];
pm = ucfc->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
ucfc->pc_ucfctrl |= pm->pm_md.pm_ucf.pm_ucf_ctrl; ucfc->pc_ucfctrl |= pm->pm_md.pm_ucf.pm_ucf_ctrl;
wrmsr(UCF_CTRL, ucfc->pc_ucfctrl); wrmsr(UCF_CTRL, ucfc->pc_ucfctrl);
ucfc->pc_globalctrl |= (1ULL << (ri + SELECTOFF(uncore_cputype))); ucfc->pc_globalctrl |= (1ULL << (ri + SELECTOFF(uncore_cputype)));
wrmsr(UC_GLOBAL_CTRL, ucfc->pc_globalctrl); wrmsr(UC_GLOBAL_CTRL, ucfc->pc_globalctrl);
PMCDBG4(MDP,STA,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)", PMCDBG4(MDP,STA,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)",
ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL), ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL),
ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL)); ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL));
return (0); return (0);
} }
static int static int
ucf_stop_pmc(int cpu, int ri) ucf_stop_pmc(int cpu, int ri, struct pmc *pm __unused)
{ {
uint32_t fc; uint32_t fc;
struct uncore_cpu *ucfc; struct uncore_cpu *ucfc;
PMCDBG2(MDP,STO,1,"ucf-stop cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STO,1,"ucf-stop cpu=%d ri=%d", cpu, ri);
ucfc = uncore_pcpu[cpu]; ucfc = uncore_pcpu[cpu];
Show All 14 Linesucf_stop_pmc(int cpu, int ri, struct pmc *pm __unused)
PMCDBG4(MDP,STO,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)", PMCDBG4(MDP,STO,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)",
ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL), ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL),
ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL)); ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL));
return (0); return (0);
} }
static int static int
ucf_write_pmc(int cpu, int ri, pmc_value_t v) ucf_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v)
{ {
struct uncore_cpu *cc; struct uncore_cpu *cc;
struct pmc *pm;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucf_npmc, KASSERT(ri >= 0 && ri < uncore_ucf_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
cc = uncore_pcpu[cpu]; cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu %d ri %d pmc not configured", __LINE__, cpu, ri));
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
v = ucf_reload_count_to_perfctr_value(v); v = ucf_reload_count_to_perfctr_value(v);
wrmsr(UCF_CTRL, 0); /* Turn off fixed counters */ wrmsr(UCF_CTRL, 0); /* Turn off fixed counters */
wrmsr(UCF_CTR0 + ri, v); wrmsr(UCF_CTR0 + ri, v);
wrmsr(UCF_CTRL, cc->pc_ucfctrl); wrmsr(UCF_CTRL, cc->pc_ucfctrl);
PMCDBG4(MDP,WRI,1, "ucf-write cpu=%d ri=%d v=%jx ucfctrl=%jx ", PMCDBG4(MDP,WRI,1, "ucf-write cpu=%d ri=%d v=%jx ucfctrl=%jx ",
▲ Show 20 Lines • Show All 183 Lines • ▼ Show 20 Lines
ucp_get_config(int cpu, int ri, struct pmc **ppm) ucp_get_config(int cpu, int ri, struct pmc **ppm)
{ {
*ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc; *ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc;
return (0); return (0);
} }
static int static int
ucp_read_pmc(int cpu, int ri, pmc_value_t *v) ucp_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v)
{ {
struct pmc *pm;
pmc_value_t tmp; pmc_value_t tmp;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
pm = uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu %d ri %d pmc not configured", __LINE__, cpu,
ri));
tmp = rdmsr(UCP_PMC0 + ri); tmp = rdmsr(UCP_PMC0 + ri);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
*v = ucp_perfctr_value_to_reload_count(tmp); *v = ucp_perfctr_value_to_reload_count(tmp);
else else
*v = tmp; *v = tmp;
PMCDBG4(MDP,REA,1, "ucp-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri, PMCDBG4(MDP,REA,1, "ucp-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri,
ri, *v); ri, *v);
Show All 16 Linesucp_release_pmc(int cpu, int ri, struct pmc *pm)
KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc
== NULL, ("[uncore,%d] PHW pmc non-NULL", __LINE__)); == NULL, ("[uncore,%d] PHW pmc non-NULL", __LINE__));
return (0); return (0);
} }
static int static int
ucp_start_pmc(int cpu, int ri) ucp_start_pmc(int cpu, int ri, struct pmc *pm)
{ {
struct pmc *pm;
uint64_t evsel; uint64_t evsel;
struct uncore_cpu *cc; struct uncore_cpu *cc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal CPU value %d", __LINE__, cpu)); ("[uncore,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
cc = uncore_pcpu[cpu]; cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] starting cpu%d,ri%d with no pmc configured",
__LINE__, cpu, ri));
PMCDBG2(MDP,STA,1, "ucp-start cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STA,1, "ucp-start cpu=%d ri=%d", cpu, ri);
evsel = pm->pm_md.pm_ucp.pm_ucp_evsel; evsel = pm->pm_md.pm_ucp.pm_ucp_evsel;
PMCDBG4(MDP,STA,2, PMCDBG4(MDP,STA,2,
"ucp-start/2 cpu=%d ri=%d evselmsr=0x%x evsel=0x%x", "ucp-start/2 cpu=%d ri=%d evselmsr=0x%x evsel=0x%x",
cpu, ri, SELECTSEL(uncore_cputype) + ri, evsel); cpu, ri, SELECTSEL(uncore_cputype) + ri, evsel);
wrmsr(SELECTSEL(uncore_cputype) + ri, evsel); wrmsr(SELECTSEL(uncore_cputype) + ri, evsel);
cc->pc_globalctrl |= (1ULL << ri); cc->pc_globalctrl |= (1ULL << ri);
wrmsr(UC_GLOBAL_CTRL, cc->pc_globalctrl); wrmsr(UC_GLOBAL_CTRL, cc->pc_globalctrl);
return (0); return (0);
} }
static int static int
ucp_stop_pmc(int cpu, int ri) ucp_stop_pmc(int cpu, int ri, struct pmc *pm __unused)
{ {
struct pmc *pm __diagused;
struct uncore_cpu *cc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row index %d", __LINE__, ri)); ("[uncore,%d] illegal row index %d", __LINE__, ri));
cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu%d ri%d no configured PMC to stop", __LINE__,
cpu, ri));
PMCDBG2(MDP,STO,1, "ucp-stop cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STO,1, "ucp-stop cpu=%d ri=%d", cpu, ri);
/* stop hw. */ /* stop hw. */
wrmsr(SELECTSEL(uncore_cputype) + ri, 0); wrmsr(SELECTSEL(uncore_cputype) + ri, 0);
/* Don't need to write UC_GLOBAL_CTRL, one disable is enough. */ /* Don't need to write UC_GLOBAL_CTRL, one disable is enough. */
return (0); return (0);
} }
static int static int
ucp_write_pmc(int cpu, int ri, pmc_value_t v) ucp_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v)
{ {
struct pmc *pm;
struct uncore_cpu *cc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row index %d", __LINE__, ri)); ("[uncore,%d] illegal row index %d", __LINE__, ri));
cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu%d ri%d no configured PMC to stop", __LINE__,
cpu, ri));
PMCDBG4(MDP,WRI,1, "ucp-write cpu=%d ri=%d msr=0x%x v=%jx", cpu, ri, PMCDBG4(MDP,WRI,1, "ucp-write cpu=%d ri=%d msr=0x%x v=%jx", cpu, ri,
UCP_PMC0 + ri, v); UCP_PMC0 + ri, v);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
v = ucp_reload_count_to_perfctr_value(v); v = ucp_reload_count_to_perfctr_value(v);
/* /*
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines
View Options

usr.bin/mandoc/Makefile

Show First 20 Lines • Show All 254 Lines • ▼ Show 20 Lines
ucf_get_config(int cpu, int ri, struct pmc **ppm) ucf_get_config(int cpu, int ri, struct pmc **ppm)
{ {
*ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc; *ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
return (0); return (0);
} }
static int static int
ucf_read_pmc(int cpu, int ri, pmc_value_t *v) ucf_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v)
{ {
struct pmc *pm;
pmc_value_t tmp; pmc_value_t tmp;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucf_npmc, KASSERT(ri >= 0 && ri < uncore_ucf_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
pm = uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu %d ri %d(%d) pmc not configured", __LINE__, cpu,
ri, ri + uncore_ucf_ri));
tmp = rdmsr(UCF_CTR0 + ri); tmp = rdmsr(UCF_CTR0 + ri);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
*v = ucf_perfctr_value_to_reload_count(tmp); *v = ucf_perfctr_value_to_reload_count(tmp);
else else
*v = tmp; *v = tmp;
PMCDBG3(MDP,REA,1, "ucf-read cpu=%d ri=%d -> v=%jx", cpu, ri, *v); PMCDBG3(MDP,REA,1, "ucf-read cpu=%d ri=%d -> v=%jx", cpu, ri, *v);
Show All 13 Linesucf_release_pmc(int cpu, int ri, struct pmc *pmc)
KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc == NULL, KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc == NULL,
("[uncore,%d] PHW pmc non-NULL", __LINE__)); ("[uncore,%d] PHW pmc non-NULL", __LINE__));
return (0); return (0);
} }
static int static int
ucf_start_pmc(int cpu, int ri) ucf_start_pmc(int cpu, int ri, struct pmc *pm)
{ {
struct pmc *pm;
struct uncore_cpu *ucfc; struct uncore_cpu *ucfc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal CPU value %d", __LINE__, cpu)); ("[uncore,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucf_npmc, KASSERT(ri >= 0 && ri < uncore_ucf_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
PMCDBG2(MDP,STA,1,"ucf-start cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STA,1,"ucf-start cpu=%d ri=%d", cpu, ri);
ucfc = uncore_pcpu[cpu]; ucfc = uncore_pcpu[cpu];
pm = ucfc->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
ucfc->pc_ucfctrl |= pm->pm_md.pm_ucf.pm_ucf_ctrl; ucfc->pc_ucfctrl |= pm->pm_md.pm_ucf.pm_ucf_ctrl;
wrmsr(UCF_CTRL, ucfc->pc_ucfctrl); wrmsr(UCF_CTRL, ucfc->pc_ucfctrl);
ucfc->pc_globalctrl |= (1ULL << (ri + SELECTOFF(uncore_cputype))); ucfc->pc_globalctrl |= (1ULL << (ri + SELECTOFF(uncore_cputype)));
wrmsr(UC_GLOBAL_CTRL, ucfc->pc_globalctrl); wrmsr(UC_GLOBAL_CTRL, ucfc->pc_globalctrl);
PMCDBG4(MDP,STA,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)", PMCDBG4(MDP,STA,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)",
ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL), ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL),
ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL)); ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL));
return (0); return (0);
} }
static int static int
ucf_stop_pmc(int cpu, int ri) ucf_stop_pmc(int cpu, int ri, struct pmc *pm __unused)
{ {
uint32_t fc; uint32_t fc;
struct uncore_cpu *ucfc; struct uncore_cpu *ucfc;
PMCDBG2(MDP,STO,1,"ucf-stop cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STO,1,"ucf-stop cpu=%d ri=%d", cpu, ri);
ucfc = uncore_pcpu[cpu]; ucfc = uncore_pcpu[cpu];
Show All 14 Linesucf_stop_pmc(int cpu, int ri, struct pmc *pm __unused)
PMCDBG4(MDP,STO,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)", PMCDBG4(MDP,STO,1,"ucfctrl=%x(%x) globalctrl=%jx(%jx)",
ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL), ucfc->pc_ucfctrl, (uint32_t) rdmsr(UCF_CTRL),
ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL)); ucfc->pc_globalctrl, rdmsr(UC_GLOBAL_CTRL));
return (0); return (0);
} }
static int static int
ucf_write_pmc(int cpu, int ri, pmc_value_t v) ucf_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v)
{ {
struct uncore_cpu *cc; struct uncore_cpu *cc;
struct pmc *pm;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucf_npmc, KASSERT(ri >= 0 && ri < uncore_ucf_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
cc = uncore_pcpu[cpu]; cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri + uncore_ucf_ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu %d ri %d pmc not configured", __LINE__, cpu, ri));
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
v = ucf_reload_count_to_perfctr_value(v); v = ucf_reload_count_to_perfctr_value(v);
wrmsr(UCF_CTRL, 0); /* Turn off fixed counters */ wrmsr(UCF_CTRL, 0); /* Turn off fixed counters */
wrmsr(UCF_CTR0 + ri, v); wrmsr(UCF_CTR0 + ri, v);
wrmsr(UCF_CTRL, cc->pc_ucfctrl); wrmsr(UCF_CTRL, cc->pc_ucfctrl);
PMCDBG4(MDP,WRI,1, "ucf-write cpu=%d ri=%d v=%jx ucfctrl=%jx ", PMCDBG4(MDP,WRI,1, "ucf-write cpu=%d ri=%d v=%jx ucfctrl=%jx ",
▲ Show 20 Lines • Show All 183 Lines • ▼ Show 20 Lines
ucp_get_config(int cpu, int ri, struct pmc **ppm) ucp_get_config(int cpu, int ri, struct pmc **ppm)
{ {
*ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc; *ppm = uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc;
return (0); return (0);
} }
static int static int
ucp_read_pmc(int cpu, int ri, pmc_value_t *v) ucp_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v)
{ {
struct pmc *pm;
pmc_value_t tmp; pmc_value_t tmp;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
pm = uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu %d ri %d pmc not configured", __LINE__, cpu,
ri));
tmp = rdmsr(UCP_PMC0 + ri); tmp = rdmsr(UCP_PMC0 + ri);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
*v = ucp_perfctr_value_to_reload_count(tmp); *v = ucp_perfctr_value_to_reload_count(tmp);
else else
*v = tmp; *v = tmp;
PMCDBG4(MDP,REA,1, "ucp-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri, PMCDBG4(MDP,REA,1, "ucp-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri,
ri, *v); ri, *v);
Show All 16 Linesucp_release_pmc(int cpu, int ri, struct pmc *pm)
KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc KASSERT(uncore_pcpu[cpu]->pc_uncorepmcs[ri].phw_pmc
== NULL, ("[uncore,%d] PHW pmc non-NULL", __LINE__)); == NULL, ("[uncore,%d] PHW pmc non-NULL", __LINE__));
return (0); return (0);
} }
static int static int
ucp_start_pmc(int cpu, int ri) ucp_start_pmc(int cpu, int ri, struct pmc *pm)
{ {
struct pmc *pm;
uint64_t evsel; uint64_t evsel;
struct uncore_cpu *cc; struct uncore_cpu *cc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal CPU value %d", __LINE__, cpu)); ("[uncore,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row-index %d", __LINE__, ri)); ("[uncore,%d] illegal row-index %d", __LINE__, ri));
cc = uncore_pcpu[cpu]; cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] starting cpu%d,ri%d with no pmc configured",
__LINE__, cpu, ri));
PMCDBG2(MDP,STA,1, "ucp-start cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STA,1, "ucp-start cpu=%d ri=%d", cpu, ri);
evsel = pm->pm_md.pm_ucp.pm_ucp_evsel; evsel = pm->pm_md.pm_ucp.pm_ucp_evsel;
PMCDBG4(MDP,STA,2, PMCDBG4(MDP,STA,2,
"ucp-start/2 cpu=%d ri=%d evselmsr=0x%x evsel=0x%x", "ucp-start/2 cpu=%d ri=%d evselmsr=0x%x evsel=0x%x",
cpu, ri, SELECTSEL(uncore_cputype) + ri, evsel); cpu, ri, SELECTSEL(uncore_cputype) + ri, evsel);
wrmsr(SELECTSEL(uncore_cputype) + ri, evsel); wrmsr(SELECTSEL(uncore_cputype) + ri, evsel);
cc->pc_globalctrl |= (1ULL << ri); cc->pc_globalctrl |= (1ULL << ri);
wrmsr(UC_GLOBAL_CTRL, cc->pc_globalctrl); wrmsr(UC_GLOBAL_CTRL, cc->pc_globalctrl);
return (0); return (0);
} }
static int static int
ucp_stop_pmc(int cpu, int ri) ucp_stop_pmc(int cpu, int ri, struct pmc *pm __unused)
{ {
struct pmc *pm __diagused;
struct uncore_cpu *cc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row index %d", __LINE__, ri)); ("[uncore,%d] illegal row index %d", __LINE__, ri));
cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu%d ri%d no configured PMC to stop", __LINE__,
cpu, ri));
PMCDBG2(MDP,STO,1, "ucp-stop cpu=%d ri=%d", cpu, ri); PMCDBG2(MDP,STO,1, "ucp-stop cpu=%d ri=%d", cpu, ri);
/* stop hw. */ /* stop hw. */
wrmsr(SELECTSEL(uncore_cputype) + ri, 0); wrmsr(SELECTSEL(uncore_cputype) + ri, 0);
/* Don't need to write UC_GLOBAL_CTRL, one disable is enough. */ /* Don't need to write UC_GLOBAL_CTRL, one disable is enough. */
return (0); return (0);
} }
static int static int
ucp_write_pmc(int cpu, int ri, pmc_value_t v) ucp_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v)
{ {
struct pmc *pm;
struct uncore_cpu *cc;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[uncore,%d] illegal cpu value %d", __LINE__, cpu)); ("[uncore,%d] illegal cpu value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < uncore_ucp_npmc, KASSERT(ri >= 0 && ri < uncore_ucp_npmc,
("[uncore,%d] illegal row index %d", __LINE__, ri)); ("[uncore,%d] illegal row index %d", __LINE__, ri));
cc = uncore_pcpu[cpu];
pm = cc->pc_uncorepmcs[ri].phw_pmc;
KASSERT(pm,
("[uncore,%d] cpu%d ri%d no configured PMC to stop", __LINE__,
cpu, ri));
PMCDBG4(MDP,WRI,1, "ucp-write cpu=%d ri=%d msr=0x%x v=%jx", cpu, ri, PMCDBG4(MDP,WRI,1, "ucp-write cpu=%d ri=%d msr=0x%x v=%jx", cpu, ri,
UCP_PMC0 + ri, v); UCP_PMC0 + ri, v);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
v = ucp_reload_count_to_perfctr_value(v); v = ucp_reload_count_to_perfctr_value(v);
/* /*
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines